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

Backed out changeset 482f29587b3c (bug 1015205)
Backed out changeset 8fc644f6e3b8 (bug 1015205)