Backed out changeset 04a18f29f774 (bug 1087038) for marionette test failures