Backed out changeset 4aad6ecf4b7d (bug 1098161) for marionette test failures