Backed out changeset 349ca77481c0 (bug 968709) for marionette test failures