diff --git a/adb/common.py b/adb/common.py
index 885392e..1d39055 100644
--- a/adb/common.py
+++ b/adb/common.py
@@ -22,10 +22,12 @@
 
 import libusb1
 import usb1
+import re
 
 from adb import usb_exceptions
 
 DEFAULT_TIMEOUT_MS = 1000
+SYSFS_PORT_SPLIT_RE = re.compile("[,/:.-]")
 
 _LOG = logging.getLogger('android_usb')
 
diff --git a/adb/common_cli.py b/adb/common_cli.py
index 270c44f..98d1716 100644
--- a/adb/common_cli.py
+++ b/adb/common_cli.py
@@ -30,14 +30,6 @@
 
 from adb import usb_exceptions
 
-
-class _PortPathAction(argparse.Action):
-  def __call__(self, parser, namespace, values, option_string=None):
-    setattr(
-        namespace, self.dest,
-        [int(i) for i in values.replace('/', ',').split(',')])
-
-
 class PositionalArg(argparse.Action):
   def __call__(self, parser, namespace, values, option_string=None):
     namespace.positional.append(values)
@@ -49,7 +41,7 @@ def GetDeviceArguments():
       '--timeout_ms', default=10000, type=int, metavar='10000',
       help='Timeout in milliseconds.')
   group.add_argument(
-      '--port_path', action=_PortPathAction,
+      '--port_path',
       help='USB port path integers (eg 1,2 or 2,1,1)')
   group.add_argument(
       '-s', '--serial',