Revert "Revert "Derp""

This reverts commit 8efde841026e854d671686b865b43ed6027af12e.