diff --git a/completions/cvs b/completions/cvs
index d6aea591..ca479657 100644
--- a/completions/cvs
+++ b/completions/cvs
@@ -252,8 +252,6 @@ _cvs()
             fi
             ;;
         cvsroot)
-            # TODO: works poorly because of the colons and -o default,
-            #       could we drop -o default?  works ok without it in cvsps
             _cvs_roots
             ;;
         export)
@@ -368,7 +366,7 @@ _cvs()
 
     return 0
 } &&
-complete -F _cvs -o default cvs
+complete -F _cvs cvs
 
 # Local variables:
 # mode: shell-script