BUG-579: Remove ImmutableMap in favor of LinkedHashMap