diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index 45ec57e8d5d7f4e9dcc42b2c78f1b6296a26c68a..cb9e822184c110c3bc23d0624c14e4f7f0478b7a 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -1049,6 +1049,10 @@ void GdbEngine::handleStopResponse(const GdbMi &data)
     }
     setState(InferiorStopped);
 
+#if 0
+    // The related code (handleAqcuiredInferior()) is disabled as well.
+    // When re-enabling, try something to avoid spurious source list updates
+    // due to unrelated no-reason stops.
     const QByteArray &msg = data.findChild("consolestreamoutput").data();
     if (msg.contains("Stopped due to shared library event") || reason.isEmpty()) {
         m_modulesListOutdated = true;
@@ -1064,6 +1068,7 @@ void GdbEngine::handleStopResponse(const GdbMi &data)
         }
         // fall through
     }
+#endif
 
     // seen on XP after removing a breakpoint while running
     //  >945*stopped,reason="signal-received",signal-name="SIGTRAP",
diff --git a/src/plugins/debugger/gdb/gdboptionspage.cpp b/src/plugins/debugger/gdb/gdboptionspage.cpp
index 226bfb7283a0ce1ab3c6c45b0e7a144e86da0ecc..b030e44977f0abe3bba41ea6b6f8e19e7eb2118a 100644
--- a/src/plugins/debugger/gdb/gdboptionspage.cpp
+++ b/src/plugins/debugger/gdb/gdboptionspage.cpp
@@ -51,6 +51,9 @@ QWidget *GdbOptionsPage::createPage(QWidget *parent)
     m_group.insert(theDebuggerAction(GdbEnvironment),
         m_ui.environmentEdit);
 
+#if 1
+    m_ui.groupBoxPluginDebugging->hide();
+#else // The related code (handleAqcuiredInferior()) is disabled as well.
     m_group.insert(theDebuggerAction(AllPluginBreakpoints),
         m_ui.radioButtonAllPluginBreakpoints);
     m_group.insert(theDebuggerAction(SelectedPluginBreakpoints),
@@ -59,6 +62,7 @@ QWidget *GdbOptionsPage::createPage(QWidget *parent)
         m_ui.radioButtonNoPluginBreakpoints);
     m_group.insert(theDebuggerAction(SelectedPluginBreakpointsPattern),
         m_ui.lineEditSelectedPluginBreakpointsPattern);
+#endif
 
     m_ui.lineEditSelectedPluginBreakpointsPattern->
         setEnabled(theDebuggerAction(SelectedPluginBreakpoints)->value().toBool());