Revert 72af90c..c88ccd1

This rolls back to commit 72af90c3290cf797ae9a8aa6fa743a8d8cdf15a5.