Backed out changeset 4c48e36e05bb (bug 1000240) for marionette failures