Revert 9cc0f51..d68e02a

This rolls back to commit 9cc0f51279d6dcc902b9c7b9c3ff18de2beadb72.