diff --git a/platform/vcs-impl/src/com/intellij/diff/Block.java b/platform/vcs-impl/src/com/intellij/diff/Block.java
index 67c74ea6660c..c4574b5383ea 100644
--- a/platform/vcs-impl/src/com/intellij/diff/Block.java
+++ b/platform/vcs-impl/src/com/intellij/diff/Block.java
@@ -16,6 +16,7 @@
 package com.intellij.diff;
 
 import com.intellij.openapi.util.text.LineTokenizer;
+import com.intellij.util.diff.Diff;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Arrays;
@@ -45,7 +46,41 @@ public class Block {
 
   @NotNull
   public Block createPreviousBlock(@NotNull String[] prevContent) {
-    return new FindBlock(prevContent, this).getBlockInThePrevVersion();
+    int startLine = myStart;
+    int endLine = myEnd;
+
+    Diff.Change change = Diff.buildChangesSomehow(prevContent, getSource());
+    while (change != null) {
+      int startLine1 = change.line0;
+      int startLine2 = change.line1;
+      int endLine1 = startLine1 + change.deleted;
+      int endLine2 = startLine2 + change.inserted;
+
+      int shiftStart = startLine2 - startLine1;
+      int shiftEnd = endLine2 - endLine1;
+
+      if (startLine2 <= myStart) {
+        startLine = myStart - shiftStart;
+      }
+
+      if (endLine2 <= myStart) {
+        startLine = myStart - shiftEnd;
+      }
+
+      if (startLine2 < myEnd) {
+        endLine = myEnd - shiftEnd;
+      }
+
+      change = change.link;
+    }
+
+    if (endLine > prevContent.length) {
+      endLine = prevContent.length;
+    }
+    if (startLine < 0) startLine = 0;
+    if (endLine < startLine) endLine = startLine;
+
+    return new Block(prevContent, startLine, endLine);
   }
 
   @NotNull
diff --git a/platform/vcs-impl/src/com/intellij/diff/FindBlock.java b/platform/vcs-impl/src/com/intellij/diff/FindBlock.java
deleted file mode 100644
index cc73ccee3a60..000000000000
--- a/platform/vcs-impl/src/com/intellij/diff/FindBlock.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright 2000-2009 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.intellij.diff;
-
-import com.intellij.util.diff.Diff;
-
-/**
- * author: lesya
- */
-class FindBlock {
-  private final Block myCurrentVersion;
-  private final String[] myLines;
-
-  public FindBlock(String[] prevVersion, Block currentVersion) {
-    myCurrentVersion = currentVersion;
-    myLines = prevVersion;
-  }
-
-  public Block getBlockInThePrevVersion() {
-    int startLine = myCurrentVersion.getStart();
-    int endLine = myCurrentVersion.getEnd();
-
-    Diff.Change change = Diff.buildChangesSomehow(myLines, myCurrentVersion.getSource());
-    while (change != null) {
-      int startLine1 = change.line0;
-      int startLine2 = change.line1;
-      int endLine1 = startLine1 + change.deleted;
-      int endLine2 = startLine2 + change.inserted;
-
-      int shiftStart = startLine2 - startLine1;
-      int shiftEnd = endLine2 - endLine1;
-
-      if (startLine2 <= myCurrentVersion.getStart()) {
-        startLine = myCurrentVersion.getStart() - shiftStart;
-      }
-
-      if (endLine2 <= myCurrentVersion.getStart()) {
-        startLine = myCurrentVersion.getStart() - shiftEnd;
-      }
-
-      if (startLine2 < myCurrentVersion.getEnd()) {
-        endLine = myCurrentVersion.getEnd() - shiftEnd;
-      }
-
-      change = change.link;
-    }
-
-    if (endLine > myLines.length) {
-      endLine = myLines.length;
-    }
-    if (startLine < 0) startLine = 0;
-    if (endLine < startLine) endLine = startLine;
-
-    return new Block(myLines, startLine, endLine);
-  }
-}