diff --git a/platform/vcs-api/vcs-api-core/resources/messages/VcsBundle.properties b/platform/vcs-api/vcs-api-core/resources/messages/VcsBundle.properties
index cadad42b2209..a795869c210d 100644
--- a/platform/vcs-api/vcs-api-core/resources/messages/VcsBundle.properties
+++ b/platform/vcs-api/vcs-api-core/resources/messages/VcsBundle.properties
@@ -319,9 +319,6 @@ label.at.date.leading=At {0}
 label.at.date.middle=at {0}
 button.tooltip.remove.commit.author.date=Remove
 
-switch.to.commit.dialog.hint.text=To switch back to the Commit dialog, use the menu under the gear icon
-switch.to.commit.dialog.hint.text.new.ui=To switch back to the Commit dialog, use the menu under the Options icon
-
 error.executing.commit=Error executing ''{0}'': {1}
 changes.action.rollback.title={0} Changes
 changes.action.rollback.custom.title={0} Changes
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/vcsToolWindowFactories.kt b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/vcsToolWindowFactories.kt
index 7e0544304ede..32b47dc137ad 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/vcsToolWindowFactories.kt
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/vcsToolWindowFactories.kt
@@ -91,32 +91,3 @@ private class CommitToolWindowFactory : VcsToolWindowFactory() {
     }
   }
 }
-
-internal class SwitchToCommitDialogHint(toolWindow: ToolWindowEx, toolbar: ActionToolbar) : ChangesViewContentManagerListener {
-  private val toolwindowGearButton: (ActionToolbar) -> JComponent = { toolbar ->
-    // see com.intellij.openapi.wm.impl.ToolWindowImpl.GearActionGroup / com.intellij.toolWindow.ToolWindowHeader.ShowOptionsAction
-    val gearIcon = if (ExperimentalUI.isNewUI()) AllIcons.Actions.More else AllIcons.General.GearPlain
-    findToolbarActionButton(toolbar) { it.templatePresentation.icon == gearIcon } ?: toolbar.component
-  }
-
-  private val actionToolbarTooltip =
-    ActionToolbarGotItTooltip("changes.view.toolwindow",
-                              if (ExperimentalUI.isNewUI()) message("switch.to.commit.dialog.hint.text.new.ui")
-                              else message("switch.to.commit.dialog.hint.text"),
-                              toolWindow.disposable, toolbar, toolwindowGearButton)
-
-  init {
-    toolWindow.project.messageBus.connect(actionToolbarTooltip.tooltipDisposable).subscribe(ChangesViewContentManagerListener.TOPIC, this)
-  }
-
-  override fun toolWindowMappingChanged() = actionToolbarTooltip.hideHint(true)
-
-  companion object {
-    fun install(project: Project) {
-      val toolWindow = ToolWindowManager.getInstance(project).getToolWindow(COMMIT_TOOLWINDOW_ID) as? ToolWindowEx ?: return
-      val toolbar = toolWindow.decorator.headerToolbar ?: return
-
-      SwitchToCommitDialogHint(toolWindow, toolbar)
-    }
-  }
-}