Does anyone have an example of a working multifield with a fieldset under 6.3?

I'm working on a 6.1 to 6.3 upgrade and every custom component we've written that uses a multifield is failing under 6.3. The "add field" button works. The data gets saved to the datastore. But the data can't be retrieved on edit. Here's the cq dialog xml code.

<?xml version="1.0" encoding="UTF-8"?>
<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
   jcr:primaryType="nt:unstructured"
   jcr:title="Image Gallery"
   sling:resourceType="cq/gui/components/authoring/dialog">
  <content
   jcr:primaryType="nt:unstructured"
   sling:resourceType="granite/ui/components/foundation/container">
  <layout
   jcr:primaryType="nt:unstructured"
   sling:resourceType="granite/ui/components/foundation/layouts/tabs"
   type="nav"/>
  <items jcr:primaryType="nt:unstructured">
  <presentation
   jcr:primaryType="nt:unstructured"
   jcr:title="Presentation"
   sling:resourceType="granite/ui/components/foundation/container">
  <layout
   jcr:primaryType="nt:unstructured"
   sling:resourceType="granite/ui/components/foundation/layouts/fixedcolumns"/>
  <items jcr:primaryType="nt:unstructured">
  <columns
   jcr:primaryType="nt:unstructured"
   sling:resourceType="granite/ui/components/foundation/container">
  <items jcr:primaryType="nt:unstructured">
  <galleryMode
   jcr:primaryType="nt:unstructured"
   sling:resourceType="granite/ui/components/foundation/form/select"
   fieldLabel="Gallery Mode"
   name="./galleryMode">
  <items jcr:primaryType="nt:unstructured">
  <item1
   jcr:primaryType="nt:unstructured"
   text="Carousel"
   value="carousel"/>
  <item2
   jcr:primaryType="nt:unstructured"
   text="Slideshow"
   value="slideshow"/>
  </items>
  </galleryMode>
  <captionMode
   jcr:primaryType="nt:unstructured"
   sling:resourceType="granite/ui/components/foundation/form/select"
   fieldLabel="Caption Mode"
   name="./captionMode">
  <items jcr:primaryType="nt:unstructured">
  <item1
   jcr:primaryType="nt:unstructured"
   text="Overlay"
   value="overlay"/>
  <item2
   jcr:primaryType="nt:unstructured"
   text="Grey Bar"
   value="greybar"/>
  </items>
  </captionMode>
  <interval
   jcr:primaryType="nt:unstructured"
   sling:resourceType="granite/ui/components/foundation/form/numberfield"
   fieldLabel="Gallery Interval"
   fieldDescription="Interval at which gallery changes images, in milliseconds"
   defaultValue="5000"
   name="./interval"/>
  <renditionHeight
   jcr:primaryType="nt:unstructured"
   sling:resourceType="granite/ui/components/foundation/form/numberfield"
   fieldLabel="Gallery Height (px)"
   fieldDescription="Set custom rendition height for images in gallery. Defaults to 500px."
   defaultValue="500"
   name="./renditionHeight"/>
  </items>
  </columns>
  </items>
  </presentation>
  <image_list
   jcr:primaryType="nt:unstructured"
   jcr:title="Image Gallery"
   sling:resourceType="granite/ui/components/foundation/container">
  <layout
   jcr:primaryType="nt:unstructured"
   sling:resourceType="granite/ui/components/foundation/layouts/fixedcolumns"/>
  <items jcr:primaryType="nt:unstructured">
  <columns
   jcr:primaryType="nt:unstructured"
   sling:resourceType="granite/ui/components/foundation/container">
  <items jcr:primaryType="nt:unstructured">
  <images
   jcr:primaryType="nt:unstructured"
   sling:resourceType="granite/ui/components/foundation/form/multifield"
   fieldLabel="Images"
   fieldDescription="Specify images for the carousel."
   nested-multifield="">
  <field
   jcr:primaryType="nt:unstructured"
   sling:resourceType="granite/ui/components/foundation/form/fieldset"
   name="./images">
  <items jcr:primaryType="nt:unstructured">
  <column
   jcr:primaryType="nt:unstructured"
   sling:resourceType="granite/ui/components/foundation/container">
  <items jcr:primaryType="nt:unstructured">
  <path
   jcr:primaryType="nt:unstructured"
   sling:resourceType="granite/ui/components/foundation/form/pathbrowser"
   class="touchui-nested-field"
   fieldLabel="Image Path"
   rootPath="/content/dam/ourapp"
   fieldDescription="Path to image asset"
   name="./path"/>
  <caption
   jcr:primaryType="nt:unstructured"
   sling:resourceType="granite/ui/components/foundation/form/textarea"
   class="touchui-nested-field"
   fieldLabel="Caption"
   fieldDescription="Overrides metadata caption value"
   name="./caption"/>
  <credit
   jcr:primaryType="nt:unstructured"
   sling:resourceType="granite/ui/components/foundation/form/textfield"
   class="touchui-nested-field"
   fieldLabel="Credit"
   fieldDescription="Overrides metadata credit value"
   name="./credit"/>
  </items>
  </column>
  </items>
  </field>
  </images>
  </items>
  </columns>
  </items>
  </image_list>
  </items>
  </content>
</jcr:root>