diff --git a/git_cl.py b/git_cl.py
index 9715f3160..c8c3c8fad 100755
--- a/git_cl.py
+++ b/git_cl.py
@@ -1093,10 +1093,6 @@ def CMDupload(parser, args):
   parser.add_option("--emulate_svn_auto_props", action="store_true",
                     dest="emulate_svn_auto_props",
                     help="Emulate Subversion's auto properties feature.")
-  parser.add_option("--desc_from_logs", action="store_true",
-                    dest="from_logs",
-                    help="""Squashes git commit logs into change description and
-                            uses message as subject""")
   parser.add_option('-c', '--use-commit-queue', action='store_true',
                     help='tell the commit queue to commit this patchset')
   if settings.GetIsGerrit():
diff --git a/tests/push-from-logs.sh b/tests/push-from-logs.sh
index 1b6ade7ff..bb15c3fa0 100755
--- a/tests/push-from-logs.sh
+++ b/tests/push-from-logs.sh
@@ -31,7 +31,7 @@ setup_gitgit
   # Prevent the editor from coming up when you upload.
   export EDITOR=$(which true)
   test_expect_success "upload succeeds (needs a server running on localhost)" \
-      "$GIT_CL upload -m test --desc_from_logs master | \
+      "$GIT_CL upload -m test master | \
       grep -q 'Issue created'"
 
   test_expect_success "git-cl status now knows the issue" \