diff --git a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionToolbarImpl.java b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionToolbarImpl.java
index 18e280194fd3..8f8bbd73cc85 100644
--- a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionToolbarImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionToolbarImpl.java
@@ -34,7 +34,6 @@ import com.intellij.util.ui.*;
 import com.intellij.util.ui.update.Activatable;
 import com.intellij.util.ui.update.UiNotifyConnector;
 import org.intellij.lang.annotations.MagicConstant;
-import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.TestOnly;
@@ -1238,11 +1237,7 @@ public class ActionToolbarImpl extends JPanel implements ActionToolbar, QuickAct
       group = outside;
     }
 
-    final class AutoPopupToolbar extends PopupToolbar implements DataProvider {
-      private AutoPopupToolbar(@NotNull String place, @NotNull ActionGroup actionGroup, boolean horizontal, @NotNull JComponent parent) {
-        super(place, actionGroup, horizontal, parent);
-      }
-
+    PopupToolbar popupToolbar = new PopupToolbar(myPlace, group, true, this) {
       @Override
       protected void onOtherActionPerformed() {
         hidePopup();
@@ -1252,18 +1247,7 @@ public class ActionToolbarImpl extends JPanel implements ActionToolbar, QuickAct
       protected @NotNull DataContext getDataContext() {
         return ActionToolbarImpl.this.getDataContext();
       }
-
-      @Override
-      public @Nullable Object getData(@NotNull @NonNls String dataId) {
-        // Prevent recursion like in EA-239860 that might happen when ActionToolbar is reattached to the new popup as a child component.
-        if (ActionToolbarImpl.this.getDataContext().getData(PlatformDataKeys.CONTEXT_COMPONENT) != this) {
-          return ActionToolbarImpl.this.getDataContext().getData(dataId);
-        }
-        return null;
-      }
-    }
-
-    PopupToolbar popupToolbar = new AutoPopupToolbar(myPlace, group, true, this);
+    };
     popupToolbar.setLayoutPolicy(NOWRAP_LAYOUT_POLICY);
     popupToolbar.updateActionsImmediately();