one more cherry-pickery to npf build
Source for buildrump.sh git rev 9e533a7324c0621809ba754010308d62beb99a10