Backout a5b75feea6dd (bug 826111) on suspicion of breaking marionette on linux on a CLOSED TREE