Still unsure we are doing the 'right' thing here, but at least let's be consistent
between our importer and exporter!