diff --git a/polygerrit-ui/app/elements/change/gr-commit-info/gr-commit-info_test.html b/polygerrit-ui/app/elements/change/gr-commit-info/gr-commit-info_test.html
index 234d903..438a3f3 100644
--- a/polygerrit-ui/app/elements/change/gr-commit-info/gr-commit-info_test.html
+++ b/polygerrit-ui/app/elements/change/gr-commit-info/gr-commit-info_test.html
@@ -99,57 +99,6 @@
           element.serverConfig), 'https://link-url');
     });
 
-    test('use gitweb when available', () => {
-      const router = document.createElement('gr-router');
-      element.serverConfig = {gitweb: {
-        url: 'url-base/',
-        type: {revision: 'xx ${project} xx ${commit} xx'},
-      }};
-      sandbox.stub(Gerrit.Nav, '_generateWeblinks',
-          router._generateWeblinks.bind(router));
-
-      element.commitInfo = {commit: 'commit-sha'};
-      element.change = {
-        project: 'project-name',
-        labels: [],
-        current_revision: element.commitInfo.commit,
-      };
-
-      assert.isOk(element._computeShowWebLink(element.change,
-          element.commitInfo, element.serverConfig));
-
-      assert.equal(element._computeWebLink(element.change, element.commitInfo,
-          element.serverConfig), 'url-base/xx project-name xx commit-sha xx');
-    });
-
-    test('prefer gitweb when both are available', () => {
-      const router = document.createElement('gr-router');
-      element.serverConfig = {gitweb: {
-        url: 'url-base/',
-        type: {revision: 'xx ${project} xx ${commit} xx'},
-      }};
-      sandbox.stub(Gerrit.Nav, '_generateWeblinks',
-          router._generateWeblinks.bind(router));
-
-      element.commitInfo = {
-        commit: 'commit-sha',
-        web_links: [{url: 'link-url'}],
-      };
-      element.change = {
-        project: 'project-name',
-        labels: [],
-        current_revision: element.commitInfo.commit,
-      };
-
-      assert.isOk(element._computeShowWebLink(element.change,
-          element.commitInfo, element.serverConfig));
-
-      const link = element._computeWebLink(element.change, element.commitInfo,
-          element.serverConfig);
-
-      assert.equal(link, 'url-base/xx project-name xx commit-sha xx');
-      assert.notEqual(link, '../../link-url');
-    });
 
     test('ignore web links that are neither gitweb nor gitiles', () => {
       const router = document.createElement('gr-router');
diff --git a/polygerrit-ui/app/elements/core/gr-router/gr-router.js b/polygerrit-ui/app/elements/core/gr-router/gr-router.js
index 2a62115..dfb1be6 100644
--- a/polygerrit-ui/app/elements/core/gr-router/gr-router.js
+++ b/polygerrit-ui/app/elements/core/gr-router/gr-router.js
@@ -280,16 +280,9 @@
     },
 
     _getPatchSetWeblink(params) {
-      const {repo, commit, options} = params;
-      const {weblinks, config} = options || {};
+      const {commit, options} = params;
+      const {weblinks} = options || {};
       const name = commit && commit.slice(0, 7);
-      const gitwebConfigUrl = this._configBasedCommitUrl(repo, commit, config);
-      if (gitwebConfigUrl) {
-        return {
-          name,
-          url: gitwebConfigUrl,
-        };
-      }
       const url = this._getSupportedWeblinkUrl(weblinks);
       if (!url) {
         return {name};
@@ -298,15 +291,6 @@
       }
     },
 
-    _configBasedCommitUrl(repo, commit, config) {
-      if (config && config.gitweb && config.gitweb.url &&
-          config.gitweb.type && config.gitweb.type.revision) {
-        return config.gitweb.url + config.gitweb.type.revision
-            .replace('${project}', repo)
-            .replace('${commit}', commit);
-      }
-    },
-
     _isDirectCommit(link) {
       // This is a whitelist of web link types that provide direct links to
       // the commit in the url property.
