diff --git a/adb/adb.h b/adb/adb.h
index e655a14..ac31f11 100644
--- a/adb/adb.h
+++ b/adb/adb.h
@@ -35,7 +35,7 @@
 #define ADB_VERSION_MAJOR 1         // Used for help/version information
 #define ADB_VERSION_MINOR 0         // Used for help/version information
 
-#define ADB_SERVER_VERSION    28    // Increment this when we want to force users to start a new adb server
+#define ADB_SERVER_VERSION    29    // Increment this when we want to force users to start a new adb server
 
 typedef struct amessage amessage;
 typedef struct apacket apacket;
@@ -86,12 +86,6 @@
         */
     int    closing;
 
-        /* flag: kick the transport when the socket is closed.
-        ** This is needed to handle commands that cause the
-        ** remote daemon to terminate, like "adb root"
-        */
-    int    kick_on_close;
-
         /* the asocket we are connected to
         */
 
diff --git a/adb/sockets.c b/adb/sockets.c
index 80152f2..df223b1 100644
--- a/adb/sockets.c
+++ b/adb/sockets.c
@@ -190,14 +190,6 @@
 
 static void local_socket_close(asocket *s)
 {
-#if ADB_HOST
-    /* to special case commands that cause the remote daemon to terminate */
-    if (s->kick_on_close && s->transport) {
-        kick_transport(s->transport);
-        /* delay to work around a race condition */
-        adb_sleep_ms(1000);
-    }
-#endif
     adb_mutex_lock(&socket_list_lock);
     local_socket_close_locked(s);
     adb_mutex_unlock(&socket_list_lock);
@@ -535,14 +527,6 @@
     apacket *p = get_apacket();
     int len = strlen(destination) + 1;
 
-#if ADB_HOST
-    /* special case commands that cause the remote daemon to terminate */
-    if (!strcmp(destination, "root:")) {
-        D("connect_to_remote setting kick_on_close for %s\n", destination);
-        s->kick_on_close = 1;
-    }
-#endif
-
     if(len > (MAX_PAYLOAD-1)) {
         fatal("destination oversized");
     }