I understand the hesitation to touch too much in here, but can we move this into _import_pkg_category_unit as well? It should have been there in the first place and you cleaned it up for group, might as well do it here too.