Added patch from jpeacock@cpan.org for RT #88266