Backed out changeset 69be1a2ffd39 (bug 912244) for Marionette failures on a CLOSED TREE