diff --git a/ptvsd/ipcjson.py b/ptvsd/ipcjson.py
index 62b87916..6ce1abdb 100644
--- a/ptvsd/ipcjson.py
+++ b/ptvsd/ipcjson.py
@@ -244,7 +244,6 @@ class IpcChannel(object):
         self.__exit = False
         self.__lock = thread.allocate_lock()
         self.__message = []
-        self._exit_on_unknown_command = True
 
     def close(self):
         # TODO: docstring
@@ -357,10 +356,6 @@ class IpcChannel(object):
     def on_invalid_request(self, request, args):
         # TODO: docstring
         self.send_response(request, success=False, message='Unknown command')
-        if self._exit_on_unknown_command:
-            # TODO: Shouldn't we let VSC decide how to handle this
-            # instead of exiting?
-            self.__exit = True
 
     def _receive_message(self, message):
         with self.__lock:
diff --git a/tests/helpers/pydevd/_binder.py b/tests/helpers/pydevd/_binder.py
index a5e98ef2..fa88daf4 100644
--- a/tests/helpers/pydevd/_binder.py
+++ b/tests/helpers/pydevd/_binder.py
@@ -26,8 +26,7 @@ class PTVSD(ptvsd.daemon.Daemon):
         )
         client, server = connect()
         self.start(server)
-        proc = self.set_connection(client)
-        proc._exit_on_unknown_command = False  # TODO: hack alert!
+        self.set_connection(client)
         return self
 
     @property