Backed out 2 changesets (bug 1038888, bug 1038921) for bustage.

Backed out changeset 045cf754d070 (bug 1038888)
Backed out changeset 8c695bbb82e9 (bug 1038921)