Revert "More derp"

This reverts commit df74993767172c23368f184f80e614d7e8c68655.