Backed out 2 changesets (bug 911346)

Backed out changeset 6255c31609be (bug 911346)
Backed out changeset cae77be484b9 (bug 911346)