Backed out changeset d5607eeaa106 (bug 1036654) for Windows build bustage on a CLOSED TREE