diff --git a/platform/lang-impl/src/com/intellij/openapi/components/impl/ModulePathMacroManager.java b/platform/lang-impl/src/com/intellij/openapi/components/impl/ModulePathMacroManager.java
index b51364ca829f..fb176b6a452f 100644
--- a/platform/lang-impl/src/com/intellij/openapi/components/impl/ModulePathMacroManager.java
+++ b/platform/lang-impl/src/com/intellij/openapi/components/impl/ModulePathMacroManager.java
@@ -45,18 +45,7 @@ public class ModulePathMacroManager extends BasePathMacroManager {
   public ReplacePathToMacroMap getReplacePathMap() {
     ReplacePathToMacroMap result = super.getReplacePathMap();
     if (!myModule.isDisposed()) {
-      String projectDir = ProjectPathMacroManager.getProjectDir(myModule.getProject());
-      if (projectDir != null) {
-        projectDir = projectDir.replace('/', File.separatorChar);
-      }
-      String stopAt = projectDir;
-
-      final String userHome = getUserHome();
-      if (stopAt != null && stopAt.startsWith(userHome)) {
-        stopAt = userHome;
-      }
-
-      addFileHierarchyReplacements(result, PathMacrosImpl.MODULE_DIR_MACRO_NAME, getModuleDir(myModule.getModuleFilePath()), stopAt);
+      addFileHierarchyReplacements(result, PathMacrosImpl.MODULE_DIR_MACRO_NAME, getModuleDir(myModule.getModuleFilePath()), getUserHome());
     }
     return result;
   }
diff --git a/platform/platform-impl/src/com/intellij/openapi/components/impl/BasePathMacroManager.java b/platform/platform-impl/src/com/intellij/openapi/components/impl/BasePathMacroManager.java
index 6cd1318ef1f8..d29b0c7b035a 100644
--- a/platform/platform-impl/src/com/intellij/openapi/components/impl/BasePathMacroManager.java
+++ b/platform/platform-impl/src/com/intellij/openapi/components/impl/BasePathMacroManager.java
@@ -81,7 +81,7 @@ public class BasePathMacroManager extends PathMacroManager {
   }
 
   protected static String getUserHome() {
-    return SystemProperties.getUserHome();
+    return StringUtil.trimEnd(SystemProperties.getUserHome(), "/");
   }