Fix (for real) the Marionette stuff (bug 741812)