Patch from RT#87566

This allows tests to pass for me on perl 5.18.1