Backed out 2 changesets (bug 1030204) for build bustage a=backout

Backed out changeset a56eae7ad1c2 (bug 1030204)
Backed out changeset ff83e05223eb (bug 1030204)