Unreviewed build fix after r206830