diff --git a/share/qtcreator/qml/qmljsdebugger/include/qdeclarativeviewobserver.h b/share/qtcreator/qml/qmljsdebugger/include/qdeclarativeviewobserver.h
index 02aee970a20..fbfdf2a39de 100644
--- a/share/qtcreator/qml/qmljsdebugger/include/qdeclarativeviewobserver.h
+++ b/share/qtcreator/qml/qmljsdebugger/include/qdeclarativeviewobserver.h
@@ -60,7 +60,6 @@ public:
     QToolBar *toolbar() const;
     static QString idStringForObject(QObject *obj);
     QRectF adjustToScreenBoundaries(const QRectF &boundingRectInSceneSpace);
-    void setDebugMode(bool isDebugMode);
 
 public Q_SLOTS:
     void setDesignModeBehavior(bool value);
diff --git a/share/qtcreator/qml/qmljsdebugger/qdeclarativeviewobserver.cpp b/share/qtcreator/qml/qmljsdebugger/qdeclarativeviewobserver.cpp
index d48d4eff537..7c179dccba3 100644
--- a/share/qtcreator/qml/qmljsdebugger/qdeclarativeviewobserver.cpp
+++ b/share/qtcreator/qml/qmljsdebugger/qdeclarativeviewobserver.cpp
@@ -37,7 +37,6 @@
 #include "boundingrecthighlighter.h"
 #include "subcomponenteditortool.h"
 #include "qmltoolbar.h"
-#include "jsdebuggeragent.h"
 
 #include "qt_private/qdeclarativedebughelper_p.h"
 
@@ -60,7 +59,6 @@ QDeclarativeViewObserverPrivate::QDeclarativeViewObserverPrivate(QDeclarativeVie
     designModeBehavior(false),
     executionPaused(false),
     slowdownFactor(1.0f),
-    jsDebuggerAgent(0),
     toolbar(0)
 {
 }
@@ -789,11 +787,6 @@ void QDeclarativeViewObserverPrivate::createToolbar()
     QObject::connect(q, SIGNAL(marqueeSelectToolActivated()), toolbar, SLOT(activateMarqueeSelectTool()));
 }
 
-void QDeclarativeViewObserver::setDebugMode(bool isDebugMode)
-{
-    if (isDebugMode && !data->jsDebuggerAgent)
-        data->jsDebuggerAgent = new JSDebuggerAgent(data->view->engine());
-}
 
 } //namespace QmlJSDebugger
 
diff --git a/share/qtcreator/qml/qmljsdebugger/qdeclarativeviewobserver_p.h b/share/qtcreator/qml/qmljsdebugger/qdeclarativeviewobserver_p.h
index 516877dd586..4f90a28cdee 100644
--- a/share/qtcreator/qml/qmljsdebugger/qdeclarativeviewobserver_p.h
+++ b/share/qtcreator/qml/qmljsdebugger/qdeclarativeviewobserver_p.h
@@ -86,8 +86,6 @@ public:
     bool executionPaused;
     qreal slowdownFactor;
 
-    JSDebuggerAgent *jsDebuggerAgent;
-
     QmlToolbar *toolbar;
 
     void clearEditorItems();
diff --git a/share/qtcreator/qml/qmlobserver/main.cpp b/share/qtcreator/qml/qmlobserver/main.cpp
index 6733265b2fe..0aac08f71e7 100644
--- a/share/qtcreator/qml/qmlobserver/main.cpp
+++ b/share/qtcreator/qml/qmlobserver/main.cpp
@@ -417,10 +417,6 @@ int main(int argc, char ** argv)
 
     viewer->setDesignModeBehavior(designModeBehavior);
 
-    // FIXME debug mode is always on for qml observer
-    debuggerModeBehavior = true;
-    viewer->setDebugMode(debuggerModeBehavior);
-
     foreach (QString lib, imports)
         viewer->addLibraryPath(lib);
 
diff --git a/share/qtcreator/qml/qmlobserver/qmlruntime.cpp b/share/qtcreator/qml/qmlobserver/qmlruntime.cpp
index d15814c7178..36d83d9a009 100644
--- a/share/qtcreator/qml/qmlobserver/qmlruntime.cpp
+++ b/share/qtcreator/qml/qmlobserver/qmlruntime.cpp
@@ -619,6 +619,7 @@ QDeclarativeViewer::QDeclarativeViewer(QWidget *parent, Qt::WindowFlags flags)
 
     canvas = new QDeclarativeView(this);
     observer = new QmlJSDebugger::QDeclarativeViewObserver(canvas, this);
+    new QmlJSDebugger::JSDebuggerAgent(canvas->engine());
     if (!(flags & Qt::FramelessWindowHint)) {
         m_crumblePathWidget = new CrumblePath(canvas);
 #ifndef Q_WS_MAC
@@ -699,11 +700,6 @@ void QDeclarativeViewer::setDesignModeBehavior(bool value)
     observer->setDesignModeBehavior(value);
 }
 
-void QDeclarativeViewer::setDebugMode(bool on)
-{
-    observer->setDebugMode(on);
-}
-
 void QDeclarativeViewer::enableExperimentalGestures()
 {
     canvas->viewport()->grabGesture(Qt::TapGesture,Qt::DontStartGestureOnChildren|Qt::ReceivePartialGestures|Qt::IgnoredGesturesPropagateToParent);
diff --git a/share/qtcreator/qml/qmlobserver/qmlruntime.h b/share/qtcreator/qml/qmlobserver/qmlruntime.h
index eb435796593..630c30c324b 100644
--- a/share/qtcreator/qml/qmlobserver/qmlruntime.h
+++ b/share/qtcreator/qml/qmlobserver/qmlruntime.h
@@ -117,7 +117,6 @@ public:
 
 public slots:
     void setDesignModeBehavior(bool value);
-    void setDebugMode(bool on);
     void sceneResized(QSize size);
     bool open(const QString&);
     void openFile();