diff --git a/adb/common_cli.py b/adb/common_cli.py
index 0ceb792..6bc89ae 100644
--- a/adb/common_cli.py
+++ b/adb/common_cli.py
@@ -128,7 +128,7 @@ def StartCli(argv, device_callback, kwarg_callback=None, list_callback=None,
   method = getattr(dev, method_name)
   argspec = inspect.getargspec(method)
   num_args = len(argspec.args) - 1  # self is the first one.
-  num_args -= len(argspec.defaults or [])
+  #num_args -= len(argspec.defaults or [])
   # Handle putting the remaining command line args into the last normal arg.
   argv.pop(0)