Revert bdd9d59..88f1812

This rolls back to commit bdd9d59abaf3ddd90e7d0511b8dafd686b43d5b6.