ad987021ce
This reverts commit ec7ea77aa8d90d2ba32089e140ed716cb6aadb89 because it's part of a PR that was red on CircleCI once it was merged into master (Windows tests are only run on master, not on PRs). PR Close #34360