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

Backed out changeset c20904b75bcc (bug 811391)
Backed out changeset f0a00bf2ba8e (bug 811391)