Revert ea85ab8..c3b175b

This rolls back to commit ea85ab8842ce505939bf76674d519e905de1f326.