Revert 14fa6d8..d5d6666

This rolls back to commit 14fa6d802228a080f4d2fe577493f285cbb1afab.
Stuff. Not working