Revert "DERP #12"

This reverts commit 8197372a7e3722365a98c258b997ceed3f690da8.