Back out f872d288480b:9b86b4e60b29 (bug 929513) for failing to build on Windows
CLOSED TREE