Revert "OMG"

This reverts commit 8e0e9ccbe6115ee16a5684aa60b132c43982dfe4.