Carry over my fix for a pure darwin perl 5.16 to 5.20