Revert bbe3166..69e9221

This rolls back to commit bbe316635f0680bd9cf206099c949409c8840d2c.
Revert 683587b..4b135ae

This rolls back to commit 683587b10c557384dfb9c96237fa7a2cb0281993.
Undo whatever I did with the merges

messed up the branch or something