diff --git a/adb/sockets.c b/adb/sockets.c
index df223b133..a73fc6218 100644
--- a/adb/sockets.c
+++ b/adb/sockets.c
@@ -598,6 +598,10 @@ unsigned unhex(unsigned char *s, int len)
 char *skip_host_serial(char *service) {
     char *first_colon, *serial_end;
 
+    if (!strncmp(service, "usb:", 4)) {
+        return strchr(service + 4, ':');
+    }
+
     first_colon = strchr(service, ':');
     if (!first_colon) {
         /* No colon in service string. */
diff --git a/adb/transport.c b/adb/transport.c
index 70fc58ed1..9c63640df 100644
--- a/adb/transport.c
+++ b/adb/transport.c
@@ -922,9 +922,6 @@ atransport *find_transport(const char *serial)
         if (t->serial && !strcmp(serial, t->serial)) {
             break;
         }
-        if (t->devpath && !strcmp(serial, t->devpath)) {
-            break;
-        }
      }
     adb_mutex_unlock(&transport_lock);