Unbreak tests after regression from r172081.