Revert b62468c..40e56cd

This rolls back to commit b62468cee0e26c746f8e22b5386da5830fc79d55.