Revert "WORKING VERSION ZOMG!!"

This reverts commit 018dfb745b09283cf0af9ef1ebebf5181a2f8140.