Backed out changeset d0d75e76d41f (bug 857417) for crashes during tests
Backed out changeset 664a2230e5c7 (bug 843793) because of Marionette test failures

Landed on a CLOSED TREE