Revert 322a672..c436932

This rolls back to commit 322a672a932b49c2e06bf3a5cba5c9f925025ea9.