diff --git a/src/plugins/debugger/debuggerruncontrol.cpp b/src/plugins/debugger/debuggerruncontrol.cpp
index 56c10575b78..f3ac12b4cdc 100644
--- a/src/plugins/debugger/debuggerruncontrol.cpp
+++ b/src/plugins/debugger/debuggerruncontrol.cpp
@@ -91,7 +91,6 @@ public:
 
     // Terminal
     Process terminalProc;
-    DebuggerRunTool::AllowTerminal allowTerminal = DebuggerRunTool::DoAllowTerminal;
 
     // DebugServer
     Process debuggerServerProc;
@@ -163,9 +162,6 @@ void DebuggerRunTool::continueAfterCoreFileSetup()
 
 void DebuggerRunTool::startTerminalIfNeededAndContinueStartup()
 {
-    if (d->allowTerminal == DoNotAllowTerminal)
-        m_runParameters.setUseTerminal(false);
-
     // CDB has a built-in console that might be preferred by some.
     const bool useCdbConsole = m_runParameters.cppEngineType() == CdbEngineType
             && (m_runParameters.startMode() == StartInternal
@@ -497,7 +493,7 @@ void DebuggerRunTool::setupPortsGatherer()
         runControl()->requestQmlChannel();
 }
 
-DebuggerRunTool::DebuggerRunTool(RunControl *runControl, AllowTerminal allowTerminal)
+DebuggerRunTool::DebuggerRunTool(RunControl *runControl)
     : RunWorker(runControl)
     , d(new DebuggerRunToolPrivate)
     , m_runParameters(DebuggerRunParameters::fromRunControl(runControl))
@@ -513,7 +509,6 @@ DebuggerRunTool::DebuggerRunTool(RunControl *runControl, AllowTerminal allowTerm
     d->debuggerServerProc.setUtf8Codec();
 
     d->runId = QString::number(++toolRunCount);
-    d->allowTerminal = allowTerminal;
 
     runControl->setIcon(ProjectExplorer::Icons::DEBUG_START_SMALL_TOOLBAR);
     runControl->setPromptToStop([](bool *optionalPrompt) {
diff --git a/src/plugins/debugger/debuggerruncontrol.h b/src/plugins/debugger/debuggerruncontrol.h
index 0b5005b714d..26f2a45c3c0 100644
--- a/src/plugins/debugger/debuggerruncontrol.h
+++ b/src/plugins/debugger/debuggerruncontrol.h
@@ -22,9 +22,7 @@ class SubChannelProvider;
 class DEBUGGER_EXPORT DebuggerRunTool : public ProjectExplorer::RunWorker
 {
 public:
-    enum AllowTerminal { DoAllowTerminal, DoNotAllowTerminal };
-    explicit DebuggerRunTool(ProjectExplorer::RunControl *runControl,
-                             AllowTerminal allowTerminal = DoAllowTerminal);
+    explicit DebuggerRunTool(ProjectExplorer::RunControl *runControl);
     ~DebuggerRunTool() override;
 
     void start() override;
diff --git a/src/plugins/remotelinux/remotelinuxdebugsupport.cpp b/src/plugins/remotelinux/remotelinuxdebugsupport.cpp
index b9869920dde..25733489471 100644
--- a/src/plugins/remotelinux/remotelinuxdebugsupport.cpp
+++ b/src/plugins/remotelinux/remotelinuxdebugsupport.cpp
@@ -47,10 +47,11 @@ public:
         setProducer([](RunControl *rc) {
             rc->requestDebugChannel();
 
-            auto debugger = new DebuggerRunTool(rc, DebuggerRunTool::DoNotAllowTerminal);
+            auto debugger = new DebuggerRunTool(rc);
             DebuggerRunParameters &rp = debugger->runParameters();
             debugger->setId("RemoteLinuxDebugWorker");
             debugger->setupPortsGatherer();
+            rp.setUseTerminal(false);
             rp.setAddQmlServerInferiorCmdArgIfNeeded(true);
 
             rp.setStartMode(AttachToRemoteServer);