Back out ab395abf96b9:837481767455 (bug 972312) for Windows build bustage
CLOSED TREE