Revert ece6b88..a62b052

This rolls back to commit ece6b88b311ef6c86302c81f85519b57e5b36504.