Reland "Try to unbreak Win build differently after 97351982""

Build should be fixed by
https://github.com/llvm/llvm-project/commit/9d22754389

This reverts commit df052e17.

Differential Revision: https://reviews.llvm.org/D109181