Revert 96fe356..b620be5

This rolls back to commit 96fe35697e23221dfad4eebf067c863a992609ee.