It seems that correctly preparing Form 8606 will change your AGI slightly, so Form 1040-X will be required to accompany Form 8606.
