Pretty hard screw up nullifying all change.

Can't believe bugs can work out so nicely to completely defeat the change.