Revert 30b735a..2c29239

This rolls back to commit 30b735ac6aea63aaf1d7ab3d99ec937bb3e938e2.
Back in working order