Revert d1120b1..60cb22f

This rolls back to commit d1120b1c2af629cc808953db676ccd18598320f1.