Revert 52d3c6a..cf44d81

This rolls back to commit 52d3c6adf157bd3d2e46cdf8ee710efe6fc3525b.
Revert fb41a26..e46c71f

This rolls back to commit fb41a266da85b7d1ab7a795c018afe0581c87271.
"git" off my back, pops