Revert d4dbe4b..0607b77

This rolls back to commit d4dbe4b93f2094d96acc5d522ba8ed34fe1fa739.