Revert b9d9089..2e90e95

This rolls back to commit b9d9089b71303a87b509d652f059ab5cd3df4545.