Reverting as this as reported allows some variables to clobber each other.
We'll work on a different fix.

This reverts commit c5469f63.