Build fix attempt after r170465.