diff --git a/platform/lang-impl/src/com/intellij/codeInspection/reference/SmartRefElementPointerImpl.java b/platform/lang-impl/src/com/intellij/codeInspection/reference/SmartRefElementPointerImpl.java
index cfb62ac15295..3bccb31eb29e 100644
--- a/platform/lang-impl/src/com/intellij/codeInspection/reference/SmartRefElementPointerImpl.java
+++ b/platform/lang-impl/src/com/intellij/codeInspection/reference/SmartRefElementPointerImpl.java
@@ -81,12 +81,12 @@ public class SmartRefElementPointerImpl implements SmartRefElementPointer {
     Element element = new Element(ENTRY_POINT);
     element.setAttribute(TYPE_ATTR, myType);
     element.setAttribute(FQNAME_ATTR, getFQName());
-    if (myRefElement != null) {
+    /*if (myRefElement != null) {
       final RefEntity entity = myRefElement.getOwner();
       if (entity != null) {
         new SmartRefElementPointerImpl(entity, myIsPersistent).writeExternal(element);
       }
-    }
+    }*/
     parentNode.addContent(element);
   }
 
diff --git a/platform/platform-resources-en/src/misc/registry.properties b/platform/platform-resources-en/src/misc/registry.properties
index 0a10aeccb1f9..afd6b1152773 100644
--- a/platform/platform-resources-en/src/misc/registry.properties
+++ b/platform/platform-resources-en/src/misc/registry.properties
@@ -216,6 +216,6 @@ ide.use.nautilus3.description=Use Nautilus if available
 ide.goto.implementation.show.interfaces=false
 ide.goto.implementation.show.interfaces.description=Whether to show sub-interfaces when invoking Goto Implementation (Ctrl+Alt+B) on an interface
 
-ide.open.editors.asynchronously=false
+ide.open.editors.asynchronously=true
 ide.open.editors.asynchronously.description=Prepare editors in background thread
 jeka=false
\ No newline at end of file