Backed out changeset ec696ad6ff10 (bug 963056) for build bustage on a CLOSED TREE