Unbreak tinderbox build after r249420.