Revert cc61322..0a37657

This rolls back to commit cc6132298de023ec6c174f43e4e940491014dd13.