diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/DefaultInsertHandler.java b/java/java-impl/src/com/intellij/codeInsight/completion/DefaultInsertHandler.java
index 9a983c1ee3ad..ecd9917022b1 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/DefaultInsertHandler.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/DefaultInsertHandler.java
@@ -24,7 +24,6 @@ import com.intellij.codeInsight.lookup.LookupItem;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.editor.Editor;
-import com.intellij.openapi.editor.RangeMarker;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.*;
@@ -102,9 +101,6 @@ public class DefaultInsertHandler extends TemplateInsertHandler implements Clone
         }
       }
       addImportForItem(context, item);
-      if (context.getTailOffset() < 0) {  //hack, hack, hack. ideally the tail offset just should survive after the importing stuff
-        context.setTailOffset(context.getEditor().getCaretModel().getOffset());
-      }
     }
     catch(IncorrectOperationException e){
       LOG.error(e);
@@ -224,11 +220,8 @@ public class DefaultInsertHandler extends TemplateInsertHandler implements Clone
       int length = lookupString.length();
       final int i = lookupString.indexOf('<');
       if (i >= 0) length = i;
-      RangeMarker savedTail = context.getDocument().createRangeMarker(context.getTailOffset(), context.getTailOffset());
       final int newOffset = addImportForClass(file, startOffset, startOffset + length, aClass);
       JavaCompletionUtil.shortenReference(file, newOffset);
-      assert savedTail.isValid();
-      context.setTailOffset(savedTail.getStartOffset());
     }
     else if (o instanceof PsiType){
       PsiType type = ((PsiType)o).getDeepComponentType();