Backed out 2 changesets (bug 894150) for crashtest orange.

Backed out changeset 80ce41a4e6ee (bug 894150)
Backed out changeset b41c7f2ddda5 (bug 894150)