Revert "Use a deterministic map for imp_dep_mods"