[Windows] Fixup for rebasing 35.0.1898.0