Revert "Merge derp"

This reverts commit aabf0c26b941b0b52373100826db5c1e1e114c40.