Revert 6f99ce5..a51fefc

This rolls back to commit 6f99ce59bd68c4872b99a57749e7ee9199c78056.
git is a bitch