Back out c9f5d3ebba39 (bug 835552) for Windows build bustage
CLOSED TREE