diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GrMapType.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GrMapType.java
index fbac5564e974..85da675a8d34 100644
--- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GrMapType.java
+++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GrMapType.java
@@ -34,7 +34,6 @@ import java.util.*;
  * @author peter
  */
 public abstract class GrMapType extends GrLiteralClassType {
-  private final String myJavaClassName;
 
   private final VolatileNotNullLazyValue<PsiType[]> myParameters = new VolatileNotNullLazyValue<PsiType[]>() {
     @NotNull
@@ -58,22 +57,18 @@ public abstract class GrMapType extends GrLiteralClassType {
                       GlobalSearchScope scope,
                       LanguageLevel languageLevel) {
     super(languageLevel, scope, facade);
-
-    myJavaClassName = facade.findClass(
-      GroovyCommonClassNames.JAVA_UTIL_LINKED_HASH_MAP, scope) != null ? GroovyCommonClassNames.JAVA_UTIL_LINKED_HASH_MAP
-                                                                       : CommonClassNames.JAVA_UTIL_MAP;
   }
 
   @NotNull
   @Override
   protected String getJavaClassName() {
-    return myJavaClassName;
+    return GroovyCommonClassNames.JAVA_UTIL_LINKED_HASH_MAP;
   }
 
   @Override
   @NotNull
   public String getClassName() {
-    return StringUtil.getShortName(myJavaClassName);
+    return "LinkedHashMap";
   }
 
   @Nullable
diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/auxiliary/GrListOrMapImpl.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/auxiliary/GrListOrMapImpl.java
index f0ba21b6c261..70c32c2b9fa4 100644
--- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/auxiliary/GrListOrMapImpl.java
+++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/auxiliary/GrListOrMapImpl.java
@@ -192,7 +192,6 @@ public class GrListOrMapImpl extends GrExpressionImpl implements GrListOrMap {
           GlobalSearchScope scope = listOrMap.getResolveScope();
           JavaPsiFacade facade = JavaPsiFacade.getInstance(listOrMap.getProject());
           PsiClass hashMap = facade.findClass(GroovyCommonClassNames.JAVA_UTIL_LINKED_HASH_MAP, scope);
-          if (hashMap == null) hashMap = facade.findClass(CommonClassNames.JAVA_UTIL_MAP, scope);
           if (hashMap != null) {
             PsiSubstitutor mapSubstitutor = PsiSubstitutor.EMPTY.
               put(hashMap.getTypeParameters()[0], com.intellij.psi.util.PsiUtil.substituteTypeParameter(lType,  CommonClassNames.JAVA_UTIL_MAP, 0, false)).