Build fix attempt after r105543.