Revert 0772f3f..e4ffc33

This rolls back to commit 0772f3f41bf122b9aa99f774d05c28a2aa6e34f7.