backout 1bab9339e6d4 (bug 1001001) for breaking the build on windows