This reverts commit a7ac1e01, reversing changes made to d690c55e.
This change breaks our windows CI and the backport (!6994 (merged)) requires more work (see !7014 (closed)). Since we're already past the code freeze, let's revert the changes and backport this in the next release.