Backed out changeset 4b84bbad669d
Backed out changeset 492fdd7c06fd (bug 914182) for Marionette failures