Revert 8190b6a..74b253e

This rolls back to commit 8190b6a15fb3cea0a432f5f85ebf71ad69f1602d.