Revert 0ee5704..345022f

This rolls back to commit 0ee570400d3ea4f8c16e8dc698f35b43854618c2.