Merge topic 'revert-per-importer-usage' into release-4.3 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !11748