Revert "Revert "Revert "Little derp"""

This reverts commit 0e6222635e096f2d351274b39b9bf4ae48dc2fc5.