Back out 44b99b1c798c and e34554f9ec37 for marionette oranges. r=backout in a CLOSED TREE
Merge backout, a=bustage fix in a CLOSED TREE