If you change the 1099-R taxable amount to zero
You won't need Form 8915-E.
When mailing 1040-X, do not include your old 1040 nor your revised 1040 because the Form 1040-X reflects any changes there and becomes your new tax return.
That leaves the issue of "new or changed" forms.
You'll have to decide if you want to submit 1040-X without Form 8915-E/F (not recommended).
You can get the form in fillable PDF from IRS.gov and make the changes manually to add an amount paid back of one third.
That's line 14,15 for 401k plans.
after amending 2020,2021, you can file 2022 without amending.
@mikehouser42
