Backed out changeset 82c2f74c26cb (bug 1084973) for Windows bustage, CLOSED TREE