diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/BinaryFilePatchInProgress.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/BinaryFilePatchInProgress.java
index e3cbd491791b..639bb0af649c 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/BinaryFilePatchInProgress.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/BinaryFilePatchInProgress.java
@@ -52,10 +52,8 @@ public class BinaryFilePatchInProgress extends AbstractFilePatchInProgress<Shelv
 
     if (myNewContentRevision != null) return myNewContentRevision;
     if (myPatch.getAfterFileName() != null) {
-      final FilePath newFilePath = FilePatchStatus.ADDED.equals(myStatus)
-                                   ? VcsUtil.getFilePathOnNonLocal(myIoCurrentBase.getAbsolutePath(),
-                                                                   false)
-                                   : detectNewFilePathForMovedOrModified();
+      final FilePath newFilePath = FilePatchStatus.ADDED.equals(myStatus) ? VcsUtil.getFilePath(myIoCurrentBase, false)
+                                                                          : detectNewFilePathForMovedOrModified();
       myNewContentRevision = new ShelvedBinaryContentRevision(newFilePath, myPatch.getShelvedBinaryFile().SHELVED_PATH);
     }
     return myNewContentRevision;
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/TextFilePatchInProgress.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/TextFilePatchInProgress.java
index 2328b9cc1888..f508220c18b8 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/TextFilePatchInProgress.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/TextFilePatchInProgress.java
@@ -53,7 +53,7 @@ public class TextFilePatchInProgress extends AbstractFilePatchInProgress<TextFil
     if (myNewContentRevision == null) {
       myConflicts = null;
       if (FilePatchStatus.ADDED.equals(myStatus)) {
-        final FilePath newFilePath = VcsUtil.getFilePathOnNonLocal(myIoCurrentBase.getAbsolutePath(), false);
+        final FilePath newFilePath = VcsUtil.getFilePath(myIoCurrentBase, false);
         final String content = myPatch.getNewFileText();
         myNewContentRevision = new SimpleContentRevision(content, newFilePath, myPatch.getAfterVersionId());
       }
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelvedBinaryFile.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelvedBinaryFile.java
index bf21c199bb33..440bb9000af9 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelvedBinaryFile.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelvedBinaryFile.java
@@ -93,10 +93,7 @@ public class ShelvedBinaryFile implements JDOMExternalizable {
       };
     }
     if (AFTER_PATH != null) {
-      File fileAfter = new File(baseDir, AFTER_PATH);
-      final FilePath file =
-        getFileStatus().equals(FileStatus.ADDED) ? VcsUtil.getFilePathOnNonLocal(fileAfter.getAbsolutePath(), false) : VcsUtil.getFilePath(
-          fileAfter, false);
+      final FilePath file = VcsUtil.getFilePath(new File(baseDir, AFTER_PATH), false);
       after = new ShelvedBinaryContentRevision(file, SHELVED_PATH);
     }
     return new Change(before, after);
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelvedChange.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelvedChange.java
index 6ba1e5877262..cc6b9408871f 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelvedChange.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelvedChange.java
@@ -148,11 +148,7 @@ public class ShelvedChange {
       }
       ContentRevision afterRevision = null;
       if (myFileStatus != FileStatus.DELETED) {
-        File afterFile = getAbsolutePath(baseDir, myAfterPath);
-        FilePath afterPath = getFileStatus().equals(FileStatus.ADDED)
-                             ? VcsUtil.getFilePathOnNonLocal(afterFile.getAbsolutePath(), false)
-                             : VcsUtil.getFilePath(
-                               afterFile, false);
+        FilePath afterPath = VcsUtil.getFilePath(getAbsolutePath(baseDir, myAfterPath), false);
         afterRevision = new PatchedContentRevision(project, beforePath, afterPath);
       }
       myChange = new Change(beforeRevision, afterRevision, myFileStatus);