Build fix after r188510