Backed out 2 changesets (bug 1056032) for bustage

Backed out changeset 18b0e0c795d4 (bug 1056032)
Backed out changeset 15caaf563783 (bug 1056032)