Revert 1b9d1ab..992e2ba

This rolls back to commit 1b9d1ab713dae282fe0f179702756fd0c3f7142c.