Backed out changeset 937f571f4655 (bug 946813)
Backed out changeset e4a784a2c735 (bug 946813) for bustage on a CLOSED TREE