diff --git a/platform/projectModel-impl/src/com/intellij/application/options/PathMacrosImpl.java b/platform/projectModel-impl/src/com/intellij/application/options/PathMacrosImpl.java
index 23fada946e81..f44c4b99c2d8 100644
--- a/platform/projectModel-impl/src/com/intellij/application/options/PathMacrosImpl.java
+++ b/platform/projectModel-impl/src/com/intellij/application/options/PathMacrosImpl.java
@@ -139,7 +139,6 @@ public class PathMacrosImpl extends PathMacros implements PersistentStateCompone
   );
 
   public PathMacrosImpl() {
-    //setMacro(USER_HOME_MACRO_NAME, FileUtil.toSystemIndependentName(SystemProperties.getUserHome()));
   }
 
   public static PathMacrosImpl getInstanceEx() {
@@ -199,12 +198,7 @@ public class PathMacrosImpl extends PathMacros implements PersistentStateCompone
 
   @Override
   public Set<String> getAllMacroNames() {
-    final Set<String> userMacroNames = getUserMacroNames();
-    final Set<String> systemMacroNames = getSystemMacroNames();
-    final Set<String> allNames = new THashSet<>(userMacroNames.size() + systemMacroNames.size());
-    allNames.addAll(systemMacroNames);
-    allNames.addAll(userMacroNames);
-    return allNames;
+    return ContainerUtil.union(getUserMacroNames(), getSystemMacroNames());
   }
 
   @Override