Revert f718d82..b6c25da

This rolls back to commit f718d8257d2d9d36dc1b07b1f7ef7f56f5a3d3e3.
Fixes bad bugs (hopefully) that I Introduced somehow :( sorry