Revert my terrible merge

This reverts commit cd5483fb5f845c43e8dea877bce5591f2c9c69e8.