Backed out 2 changesets (bug 939582) because of build bustage

Backed out changeset 2079c828645a (bug 939582)
Backed out changeset af472e590088 (bug 939582)