Revert "Revert "Derp""

This reverts commit 4d99fa9e4496b4f5891d9dcb3272b0526415ee49.