Revert "Fixing Everything"

This reverts commit 13b431526f61b3f42dd3dcc3bf2d315e3d02027a, reversing
changes made to 86d2d43a50bd4f5a762aefc1796d90e76327f027.
Revert 13b4315..cb92235

This rolls back to commit 13b431526f61b3f42dd3dcc3bf2d315e3d02027a.