Backout bug 658909 for Marionette bustage.
Merge backout.