Resolve https://rt.cpan.org/Ticket/Display.html?id=92423

See commit message for details.