Backed out changeset 5548373ee88b (bug 1073732) for marionette test failures on a CLOSED TREE