Backed out changeset ea3392e0018f (bug 943719) because of build bustage on a CLOSED TREE