IIRC we have this code in marionette forms no? we should include it as part of this patch