Minor comment: the removal of this export should be in a separate commit as technically it's fixing a separate bug and not related to supporting multiple geometries on a feature.