[Windows] Unreviewed gardening following r174585.