Fix marionette bustage - follow-up of bug 1080948. CLOSED TREE. r=bustage