diff --git a/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/UpdateFoldRegionsOperation.java b/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/UpdateFoldRegionsOperation.java
index 9676ac79dbd9..27f5b243c4a7 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/UpdateFoldRegionsOperation.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/UpdateFoldRegionsOperation.java
@@ -93,8 +93,6 @@ class UpdateFoldRegionsOperation implements Runnable {
     List<FoldRegion> newRegions = addNewRegions(info, foldingModel, elementsToFold, rangeToExpandStatusMap, shouldExpand, groupExpand);
 
     applyExpandStatus(newRegions, shouldExpand, groupExpand);
-    
-    foldingModel.clearExternalChangeFlag();
   }
 
   private static void applyExpandStatus(@NotNull List<FoldRegion> newRegions,
@@ -250,10 +248,7 @@ class UpdateFoldRegionsOperation implements Runnable {
   }
 
   private boolean regionCanBeRemovedWhenCollapsed(FoldRegion region) {
-    return Boolean.TRUE.equals(region.getUserData(CAN_BE_REMOVED_WHEN_COLLAPSED)) || 
-           ((FoldingModelEx)myEditor.getFoldingModel()).documentHasBeenChangedExternally() || 
-           !region.isValid() || 
-           isRegionInCaretLine(region);
+    return Boolean.TRUE.equals(region.getUserData(CAN_BE_REMOVED_WHEN_COLLAPSED)) || !region.isValid() || isRegionInCaretLine(region);
   }
 
   private boolean isRegionInCaretLine(FoldRegion region) {
diff --git a/platform/lang-impl/src/com/intellij/injected/editor/FoldingModelWindow.java b/platform/lang-impl/src/com/intellij/injected/editor/FoldingModelWindow.java
index 08041767cd57..50bd50d4df16 100644
--- a/platform/lang-impl/src/com/intellij/injected/editor/FoldingModelWindow.java
+++ b/platform/lang-impl/src/com/intellij/injected/editor/FoldingModelWindow.java
@@ -200,15 +200,6 @@ class FoldingModelWindow implements FoldingModelEx{
     return result;
   }
 
-  @Override
-  public boolean documentHasBeenChangedExternally() {
-    return false;
-  }
-
-  @Override
-  public void clearExternalChangeFlag() {
-  }
-
   @Override
   public void clearFoldRegions() {
     myDelegate.clearFoldRegions();
diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/ex/FoldingModelEx.java b/platform/platform-impl/src/com/intellij/openapi/editor/ex/FoldingModelEx.java
index 53246ea58aab..47eec67a0631 100644
--- a/platform/platform-impl/src/com/intellij/openapi/editor/ex/FoldingModelEx.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/ex/FoldingModelEx.java
@@ -64,8 +64,4 @@ public interface FoldingModelEx extends FoldingModel {
   
   @NotNull
   List<FoldRegion> getGroupedRegions(FoldingGroup group);
-  
-  boolean documentHasBeenChangedExternally();
-  
-  void clearExternalChangeFlag();
 }
diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/FoldingModelImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/FoldingModelImpl.java
index 7e5dee7abeb6..f083cc233785 100644
--- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/FoldingModelImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/FoldingModelImpl.java
@@ -26,7 +26,6 @@ package com.intellij.openapi.editor.impl;
 
 import com.intellij.diagnostic.Dumpable;
 import com.intellij.openapi.Disposable;
-import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.application.ex.ApplicationManagerEx;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.editor.*;
@@ -37,7 +36,6 @@ import com.intellij.openapi.editor.markup.TextAttributes;
 import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.util.Key;
 import com.intellij.openapi.util.ModificationTracker;
-import com.intellij.psi.ExternalChangeAction;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.containers.MultiMap;
 import org.jetbrains.annotations.NotNull;
@@ -67,7 +65,6 @@ public class FoldingModelImpl implements FoldingModelEx, PrioritizedInternalDocu
   private int mySavedCaretShift;
   private final MultiMap<FoldingGroup, FoldRegion> myGroups = new MultiMap<FoldingGroup, FoldRegion>();
   private boolean myDocumentChangeProcessed = true;
-  private boolean myDocumentHasBeenChangedExternally;
   private final AtomicLong myExpansionCounter = new AtomicLong();
 
   public FoldingModelImpl(EditorImpl editor) {
@@ -535,7 +532,6 @@ public class FoldingModelImpl implements FoldingModelEx, PrioritizedInternalDocu
       if (!((DocumentEx)event.getDocument()).isInBulkUpdate()) {
         updateCachedOffsets();
       }
-      if (ApplicationManager.getApplication().hasWriteAction(ExternalChangeAction.class)) myDocumentHasBeenChangedExternally = true;
     }
     finally {
       myDocumentChangeProcessed = true;
@@ -597,14 +593,4 @@ public class FoldingModelImpl implements FoldingModelEx, PrioritizedInternalDocu
   public long getModificationCount() {
     return myExpansionCounter.get();
   }
-
-  @Override
-  public boolean documentHasBeenChangedExternally() {
-    return myDocumentHasBeenChangedExternally;
-  }
-
-  @Override
-  public void clearExternalChangeFlag() {
-    myDocumentHasBeenChangedExternally = false;
-  }
 }