Revert 03f638f..935285f

This rolls back to commit 03f638f09abd449291772d0bed8219de5368d730.
blech, the nether