--- a/b2g/chrome/content/settings.js
+++ b/b2g/chrome/content/settings.js
@@ -457,20 +457,16 @@ SettingsListener.observe("lockscreen.ena
     // This preference is consulted during startup
     Services.prefs.savePrefFile(null);
     try {
       value ? USBRemoteDebugger.start() : USBRemoteDebugger.stop();
     } catch(e) {
       dump("Error while initializing USB devtools: "
            + e + "\n" + e.stack + "\n");
     }
-
-#ifdef MOZ_WIDGET_GONK
-    AdbController.setRemoteDebuggerState(value);
-#endif
   });
 
   SettingsListener.observe('debugger.remote-mode', 'disabled', function(value) {
     if (['disabled', 'adb-only', 'adb-devtools'].indexOf(value) == -1) {
       dump('Illegal value for debugger.remote-mode: ' + value + '\n');
       return;
     }