Revert d77455c..b3bf647

This rolls back to commit d77455ccfe3e59d756f95b2c028acd51250f59e3.