Revert 4f28d3a..029c3c4

This rolls back to commit 4f28d3aaa486dc329eef9b6ffdd4542d329a348f.
Revert 029c3c4..7de3690

This rolls back to commit 029c3c49683284096604f502f43f51c2d13c8718.
As of 2 AM on Toboys birthday

yarp