Revert d77455c..428a3ca

This rolls back to commit d77455ccfe3e59d756f95b2c028acd51250f59e3.