This reverts commit 7bc58a77. It breaks EXPENSIVE_CHECKS on Windows (cherry picked from commit cef838e6)