Revert d17665e..44d7fd9

This rolls back to commit d17665e85d8be8d5b97cac93971f206a2325d5a7.