Revert cf920b8..833ce88

This rolls back to commit cf920b8246bce88563d8d0a339bf67f277415f36.