Revert d7bd544..8a2501a

This rolls back to commit d7bd54414cc02cacdd633da6f52925971eaec0b6.