Backed out changeset 1a2f028d66cf (bug 897871) for Marionette failures