Better build fix after r93384.