Revert "Use LinkedHashMap to get deterministic config order"

1 files changed, 3 insertions, 2 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/AbstractService.java b/config-model/src/main/java/com/yahoo/vespa/model/AbstractService.java
index 5cbb8fc0f41..78cbb722bc7 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/AbstractService.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/AbstractService.java
@@ -12,6 +12,7 @@ import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
@@ -121,7 +122,7 @@ public abstract class AbstractService extends AbstractConfigProducer<AbstractCon
      * @param services A {@link Collection} of services of the same type, not necessarily on the same host.
      */
     public static <SERVICE extends AbstractService> void distributeCpuSocketAffinity(Collection<SERVICE> services) {
-        Map<HostResource, List<SERVICE>> affinityMap = new LinkedHashMap<>();
+        Map<HostResource, List<SERVICE>> affinityMap = new HashMap<>();
         for (SERVICE service : services) {
             if (!affinityMap.containsKey(service.getHostResource())) {
                 affinityMap.put(service.getHostResource(), new ArrayList<>());
@@ -459,7 +460,7 @@ public abstract class AbstractService extends AbstractConfigProducer<AbstractCon
      *
      * @return the default dimensions for this service
      */
-    public Map<String, String> getDefaultMetricDimensions(){ return new LinkedHashMap<>(); }
+    public HashMap<String, String> getDefaultMetricDimensions(){ return new LinkedHashMap<>(); }
 
     // For testing
     public int getNumPortsAllocated() {