Revert "oops"

This reverts commit 0ba27c04a64005992b12c51734d2f9e87ef1add1.
Revert "Cleanup this nasty hack tomorrow"

This reverts commit 57b2122c1c32beb0b722153ecd1897a150701369.