Revert 1309555..4601ed9

This rolls back to commit 13095556b97946c3f414001e1e7b986400225c6e.