Revert 8e6d730..f7ae15c

This rolls back to commit 8e6d7303ac0f3a4a920cb0a26172580577f601ee.