Backed out changeset 91579a455888 (bug 976446) for build bustage on a CLOSED TREE