diff --git a/git_cl.py b/git_cl.py
index 7dc9bace6..1f62dc055 100755
--- a/git_cl.py
+++ b/git_cl.py
@@ -2013,7 +2013,6 @@ class _RietveldChangelistImpl(_ChangelistCodereviewBase):
           remote_url = '%s@%s' % (self.GetRemoteUrl(),
                                   self.GetUpstreamBranch().split('/')[-1])
     if remote_url:
-      upload_args.extend(['--base_url', remote_url])
       remote, remote_branch = self.GetRemoteBranch()
       target_ref = GetTargetRef(remote, remote_branch, options.target_branch,
                                 settings.GetPendingRefPrefix())
diff --git a/tests/push-basic.sh b/tests/push-basic.sh
index b9d09de7f..72dd9bf1d 100755
--- a/tests/push-basic.sh
+++ b/tests/push-basic.sh
@@ -45,10 +45,6 @@ setup_gitgit
        --data-urlencode xsrf_token="$(print_xsrf_token)" \
        $URL/edit
 
-  API=$(echo $URL | sed -e 's/\([0-9]\+\)$/api\/\1/')
-  test_expect_success "Base URL contains branch name" \
-      "curl -s $API | python -mjson.tool | grep base_url | grep -q '@master'"
-
   test_expect_success "git-cl land ok" \
     "$GIT_CL land -f --no-oauth2"
 
diff --git a/third_party/upload.py b/third_party/upload.py
index dc145ef7b..0104166c0 100755
--- a/third_party/upload.py
+++ b/third_party/upload.py
@@ -632,10 +632,6 @@ group = parser.add_option_group("Patch options")
 group.add_option("-i", "--issue", type="int", action="store",
                  metavar="ISSUE", default=None,
                  help="Issue number to which to add. Defaults to new issue.")
-group.add_option("--base_url", action="store", dest="base_url", default=None,
-                 help="Base URL path for files (listed as \"Base URL\" when "
-                 "viewing issue).  If omitted, will be guessed automatically "
-                 "for SVN repos and left blank for others.")
 group.add_option("--target_ref", action="store", dest="target_ref",
                  default=None,
                  help="The target ref that is transitively tracked by the "
@@ -2373,19 +2369,7 @@ def RealMain(argv, data=None):
 
   vcs = GuessVCS(options)
 
-  base = options.base_url
-  if isinstance(vcs, SubversionVCS):
-    # Guessing the base field is only supported for Subversion.
-    # Note: Fetching base files may become deprecated in future releases.
-    guessed_base = vcs.GuessBase(options.download_base)
-    if base:
-      if guessed_base and base != guessed_base:
-        print("Using base URL \"%s\" from --base_url instead of \"%s\"" %
-              (base, guessed_base))
-    else:
-      base = guessed_base
-
-  if not base and options.download_base:
+  if options.download_base:
     options.download_base = True
     LOGGER.info("Enabled upload of base file")
   if not options.assume_yes:
@@ -2408,14 +2392,6 @@ def RealMain(argv, data=None):
   repo_guid = vcs.GetGUID()
   if repo_guid:
     form_fields.append(("repo_guid", repo_guid))
-  if base:
-    b = urlparse.urlparse(base)
-    username, netloc = urllib.splituser(b.netloc)
-    if username:
-      LOGGER.info("Removed username from base URL")
-      base = urlparse.urlunparse((b.scheme, netloc, b.path, b.params,
-                                  b.query, b.fragment))
-    form_fields.append(("base", base))
   if options.issue:
     form_fields.append(("issue", str(options.issue)))
   if options.email: