Revert d812016..d9a0151

This rolls back to commit d8120165147e8682b768ebc723cb465819b53849.