Back out bb4938013af5 and 9bee7d808f97 (bug 827976) for marionette bustage
CLOSED TREE