This reverts commit 58671ebf. I am reverting this because the tests broke and because the code itself looks hideous.
