backing out usage of Maps.newTreeMap