Issue #16826: Revert fix while Windows issues are being worked out.
5 files changed