Backed out 2 changesets (bug 970691) for build bustage on a CLOSED TREE

Backed out changeset 83f7aec5a083 (bug 970691)
Backed out changeset 94348d189ed5 (bug 970691)