Revert "Revert "Derp""

This reverts commit f640668fd516fb822605b78e6770967b42b9c092.