Backout aad75c7c49c5:2addf5bd1730 (bug 830164) for B2G marionette failures on a CLOSED TREE