diff --git a/platform/lang-impl/src/com/intellij/codeInsight/completion/CodeCompletionHandlerBase.java b/platform/lang-impl/src/com/intellij/codeInsight/completion/CodeCompletionHandlerBase.java
index 901dd3407581..1837d5e065bf 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/completion/CodeCompletionHandlerBase.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/completion/CodeCompletionHandlerBase.java
@@ -257,7 +257,6 @@ public class CodeCompletionHandlerBase implements CodeInsightActionHandler {
     if (editor.isOneLineMode()) {
       lookup.setCancelOnClickOutside(true);
       lookup.setCancelOnOtherWindowOpen(true);
-      lookup.setForceLightweightPopup(false);
     }
     lookup.setFocused(!autopopup);
     return lookup;
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/documentation/DocumentationManager.java b/platform/lang-impl/src/com/intellij/codeInsight/documentation/DocumentationManager.java
index 4b5cae8b6ec4..ad19a7d35ec8 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/documentation/DocumentationManager.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/documentation/DocumentationManager.java
@@ -147,12 +147,12 @@ public class DocumentationManager {
     PopupUpdateProcessor updateProcessor = new PopupUpdateProcessor(element.getProject()) {
       public void updatePopup(Object lookupItemObject) {
         if (lookupItemObject instanceof PsiElement) {
-          doShowJavaDocInfo((PsiElement)lookupItemObject, true, false, this, original, false);
+          doShowJavaDocInfo((PsiElement)lookupItemObject, false, this, original, false);
         }
       }
     };
 
-    doShowJavaDocInfo(element, true, false, updateProcessor, original, false);
+    doShowJavaDocInfo(element, false, updateProcessor, original, false);
   }
 
   public void showJavaDocInfo(final Editor editor, @Nullable final PsiFile file, boolean requestFocus) {
@@ -205,7 +205,7 @@ public class DocumentationManager {
     final PopupUpdateProcessor updateProcessor = new PopupUpdateProcessor(project) {
       public void updatePopup(Object lookupIteObject) {
         if (lookupIteObject instanceof PsiElement) {
-          doShowJavaDocInfo((PsiElement)lookupIteObject, false, false, this, originalElement, autoupdate);
+          doShowJavaDocInfo((PsiElement)lookupIteObject, false, this, originalElement, autoupdate);
           return;
         }
 
@@ -228,15 +228,16 @@ public class DocumentationManager {
           }
         }
         else {
-          doShowJavaDocInfo(element, false, false, this, originalElement, autoupdate);
+          doShowJavaDocInfo(element, false, this, originalElement, autoupdate);
         }
       }
     };
 
-    doShowJavaDocInfo(element, false, requestFocus, updateProcessor, originalElement, autoupdate);
+    doShowJavaDocInfo(element, requestFocus, updateProcessor, originalElement, autoupdate);
   }
 
-  private void doShowJavaDocInfo(final PsiElement element, boolean heavyWeight, boolean requestFocus, PopupUpdateProcessor updateProcessor, final PsiElement originalElement, final boolean autoupdate) {
+  private void doShowJavaDocInfo(final PsiElement element, boolean requestFocus, PopupUpdateProcessor updateProcessor,
+                                 final PsiElement originalElement, final boolean autoupdate) {
     Project project = getProject(element);
 
     if (myToolWindow == null && PropertiesComponent.getInstance().isTrueValue(SHOW_DOCUMENTATION_IN_TOOL_WINDOW)) {
@@ -304,7 +305,6 @@ public class DocumentationManager {
           .addListener(updateProcessor)
           .addUserData(updateProcessor)
           .setKeyboardActions(actions)
-          .setForceHeavyweight(heavyWeight)
           .setDimensionServiceKey(myProject, JAVADOC_LOCATION_AND_SIZE, false)
           .setResizable(true)
           .setMovable(true)
diff --git a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java
index d1e54b1e4698..4899cebe2a77 100644
--- a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java
+++ b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java
@@ -744,7 +744,7 @@ public abstract class ChooseByNameBase {
         close(false);
         return Boolean.TRUE;
       }
-    }).setFocusable(true).setRequestFocus(true).setForceHeavyweight(true).setModalContext(false).setCancelOnClickOutside(false);
+    }).setFocusable(true).setRequestFocus(true).setModalContext(false).setCancelOnClickOutside(false);
 
     Point point = new Point(x, y);
     SwingUtilities.convertPointToScreen(point, layeredPane);
diff --git a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNamePopup.java b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNamePopup.java
index a2d2430f6cca..169d914f942b 100644
--- a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNamePopup.java
+++ b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNamePopup.java
@@ -128,7 +128,7 @@ public class ChooseByNamePopup extends ChooseByNameBase implements ChooseByNameP
     if (myDropdownPopup == null) {
       ComponentPopupBuilder builder = JBPopupFactory.getInstance().createComponentPopupBuilder(myListScrollPane, myListScrollPane);
       builder.setFocusable(false).setRequestFocus(false).setCancelKeyEnabled(false).setFocusOwners(new JComponent[] {myTextField}).setBelongsToGlobalPopupStack(false)
-        .setForceHeavyweight(true).setModalContext(false).setAdText(adText).setMayBeParent(true);
+        .setModalContext(false).setAdText(adText).setMayBeParent(true);
       builder.setCancelCallback(new Computable<Boolean>() {
         @Override
         public Boolean compute() {
diff --git a/platform/platform-impl/src/com/intellij/ui/LightweightHint.java b/platform/platform-impl/src/com/intellij/ui/LightweightHint.java
index f2d658a3c651..df543591b565 100644
--- a/platform/platform-impl/src/com/intellij/ui/LightweightHint.java
+++ b/platform/platform-impl/src/com/intellij/ui/LightweightHint.java
@@ -212,7 +212,6 @@ public class LightweightHint extends UserDataHolderBase implements Hint {
           }
         })
         .setCancelOnOtherWindowOpen(myCancelOnOtherWindowOpen)
-        .setForceHeavyweight(!myForceLightweightPopup && myForceShowAsPopup)
         .createPopup();
 
       beforeShow();
diff --git a/platform/platform-impl/src/com/intellij/ui/popup/FramelessNotificationPopup.java b/platform/platform-impl/src/com/intellij/ui/popup/FramelessNotificationPopup.java
index 2fd002286da1..d0375ec1cc58 100644
--- a/platform/platform-impl/src/com/intellij/ui/popup/FramelessNotificationPopup.java
+++ b/platform/platform-impl/src/com/intellij/ui/popup/FramelessNotificationPopup.java
@@ -80,7 +80,6 @@ public class FramelessNotificationPopup {
 
     myFadeInTimer = UIUtil.createNamedTimer("Frameless fade in",10, myFadeTracker);
     myPopup = JBPopupFactory.getInstance().createComponentPopupBuilder(myContent, null)
-      .setForceHeavyweight(true)
       .setRequestFocus(false)
       .setResizable(false)
       .setMovable(true)