Reverting back to Jul 8th commit.

That cleanup broke too much shit.