Back out cc6f66e761d8 (bug 896797) for Windows build bustage
CLOSED TREE