Revert 7e843ff..b2ead25

This rolls back to commit 7e843ffe6517992ddf82e70795d646ee1b35576b.