This was fixed for MSVC tools by commit 1df92eea, but per
buildfarm member bowerbird genbki.pl needs the same treatment.

Backpatch to all live branches.