Better build fix attempt after r252434.