Back out 024623d015e9:fa1dd7e7aa22 (bug 895358) for Windows build bustage
CLOSED TREE