Fixed #21500 -- Removed imports of deprecated utils.importlib