It appears that this bug has been fixed, so you can now use the actual code shown on the Form 1099-R provided by the payer instead of using the code-G workaround.
