Backed out changeset e8ffcf4b8e22 (bug 846901)
Backed out changeset 00280175733e (bug 846901) for crashes; CLOSED TREE