Back out updater change, and reduce testing utils changes