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

Backed out changeset 1cfb645267a4 (bug 1041180)
Backed out changeset afc9903ff28f (bug 1041180)