Backed out changeset 48d2538788ec (bug 848489) for Marionette failures on a CLOSED TREE.