Revert 1a72f06..5c21367

This rolls back to commit 1a72f06f86b1780630d3cfb75d6d930bb2d8c08e.
Change a lot of things