It seems to me that the instruction for line 4 of Form 8606 applies only if Form 8606 is being used to calculate the nontaxable and taxable amounts, so both are right. If Worksheet 1-1 is being used, the instruction for Form 8606 line 4 is irrelevant and should be disregarded.
