Really fixing the double step problem.

Removing old partial fix.