This reverts commit 67f34054. This reapplies commit f99e5a91. This improves commit 8ab388e1 that unsucessfully attempted to forward-fix Windows test failure.