#18159 introduced a workaround for a dotnet/runtime regression.

We should look into whether that workaround is still needed in the .NET 8 timeframe (or even sooner if we remember).

It should be a simple matter of just reverting the workaround and then run through the bots to see if the tests (especially the macOS tests on older bots) are still green.