Build fix after r188982