Another build fix attempt after r105543.