Revert ea5fb60..aecb641

This rolls back to commit ea5fb60c8098a8062faee2b8e6cbc73e71d7d954.