Backing out broken marionette update