diff --git a/git_cl.py b/git_cl.py
index 5e166324f..90b054222 100755
--- a/git_cl.py
+++ b/git_cl.py
@@ -1019,9 +1019,8 @@ def LoadCodereviewSettingsFromFile(fileobj):
   SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
   SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
 
-  if 'GERRIT_HOST' in keyvals and 'GERRIT_PORT' in keyvals:
+  if 'GERRIT_HOST' in keyvals:
     RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
-    RunGit(['config', 'gerrit.port', keyvals['GERRIT_PORT']])
 
   if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
     #should be of the form
diff --git a/tests/git_cl_test.py b/tests/git_cl_test.py
index dce632ea9..0cd6fea6f 100755
--- a/tests/git_cl_test.py
+++ b/tests/git_cl_test.py
@@ -662,7 +662,6 @@ class TestGitCl(TestCase):
            'rietveld.viewvc-url'],), ''),
         ((['git', 'config', 'gerrit.host',
            'gerrit.chromium.org'],), ''),
-        ((['git', 'config', 'gerrit.port', '29418'],), ''),
         # DownloadHooks(False)
         ((['git', 'config', 'gerrit.host'],),
          'gerrit.chromium.org'),