Build fix after r194250