Unreviewed, follow-up fix after r249842