Unreviewed build fix after r211570