Revert a67c9a2..92aafd2

This rolls back to commit a67c9a2ed7ab9338e31b9926bc6e75345cda527b.