BUG-1440: remove open-coded Multimap