diff --git a/src/plugins/debugger/watchhandler.cpp b/src/plugins/debugger/watchhandler.cpp
index d1680a9d340b498a56dcf91b58deeff25297afbb..58a74cbdad9e02d997db00e8ac28cbf63f83afa1 100644
--- a/src/plugins/debugger/watchhandler.cpp
+++ b/src/plugins/debugger/watchhandler.cpp
@@ -207,14 +207,14 @@ void WatchModel::beginCycle(bool fullCycle)
     if (fullCycle)
         m_generationCounter++;
 
-    emit enableUpdates(false);
+    //emit enableUpdates(false);
 }
 
 void WatchModel::endCycle()
 {
     removeOutdated();
     m_fetchTriggered.clear();
-    emit enableUpdates(true);
+    //emit enableUpdates(true);
 }
 
 DebuggerEngine *WatchModel::engine() const
diff --git a/src/plugins/debugger/watchhandler.h b/src/plugins/debugger/watchhandler.h
index d5e8653267cf7f89ce5a64205e157926fa0923a6..f4531eae4ea86bb632480a0decb8e49bd88df685 100644
--- a/src/plugins/debugger/watchhandler.h
+++ b/src/plugins/debugger/watchhandler.h
@@ -122,9 +122,6 @@ private:
     void dumpHelper(WatchItem *item);
     void emitAllChanged();
 
-signals:
-    void enableUpdates(bool);
-
 private:
     QString displayType(const WatchData &typeIn) const;
     QString formattedValue(const WatchData &data) const;
diff --git a/src/plugins/debugger/watchwindow.cpp b/src/plugins/debugger/watchwindow.cpp
index 4f464188ff876177f5c737716f0d8ae80a80f545..f9faefd2b4fb069b4f84fe0bb95f143771bb4dd3 100644
--- a/src/plugins/debugger/watchwindow.cpp
+++ b/src/plugins/debugger/watchwindow.cpp
@@ -997,23 +997,11 @@ void WatchWindow::setModel(QAbstractItemModel *model)
     }
 
     connect(model, SIGNAL(layoutChanged()), SLOT(resetHelper()));
-    connect(model, SIGNAL(enableUpdates(bool)), SLOT(setUpdatesEnabled(bool)));
-    // Potentially left in disabled state in case engine crashes when expanding.
-    setUpdatesEnabled(true);
-}
-
-void WatchWindow::setUpdatesEnabled(bool enable)
-{
-    //qDebug() << "ENABLING UPDATES: " << enable;
-    QTreeView::setUpdatesEnabled(enable);
 }
 
 void WatchWindow::resetHelper()
 {
-    bool old = updatesEnabled();
-    setUpdatesEnabled(false);
     resetHelper(model()->index(0, 0));
-    setUpdatesEnabled(old);
 }
 
 void WatchWindow::resetHelper(const QModelIndex &idx)
diff --git a/src/plugins/debugger/watchwindow.h b/src/plugins/debugger/watchwindow.h
index 6ef9f55936d32e39b50fba1cc6351f06ed4ffda9..8e33506ac7ef4bc07ba8a883246bbed8430c1420 100644
--- a/src/plugins/debugger/watchwindow.h
+++ b/src/plugins/debugger/watchwindow.h
@@ -62,7 +62,6 @@ private:
     Q_SLOT void resetHelper();
     Q_SLOT void expandNode(const QModelIndex &idx);
     Q_SLOT void collapseNode(const QModelIndex &idx);
-    Q_SLOT void setUpdatesEnabled(bool enable);
 
     void setModel(QAbstractItemModel *model);
     void keyPressEvent(QKeyEvent *ev);