Revert "Lots of random fixes."

This reverts commit c47e4a04153af96ef2703c9eb3e60f753ddb7dc4.
This is for @b3ll.