Revert "merge derp repair"

This reverts commit 7a1ccc6378fca49a1e634b85d71b18cf33ed84d2.