mainline (21.5) windows native compile problem