Backed out changeset c6c6535fb6c2 (bug 844530) for Marionette failures on a CLOSED TREE.