Revert "Crappy Changes"

This reverts commit 44154c6619bf0f004a54415b359125e7cbd4c6d6.