Backed out changeset 34f371b1024b (bug 1021290) for Windows build bustage on a CLOSED TREE