Build fix attempt after r154156.