diff --git a/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.js b/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.js
index 409fd09..56be27d 100644
--- a/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.js
+++ b/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.js
@@ -26,8 +26,6 @@
     RIGHT: 'right',
   };
 
-  const HASH_PATTERN = /^[ab]?\d+$/;
-
   Polymer({
     is: 'gr-diff-view',
 
@@ -467,7 +465,7 @@
     _paramsChanged(value) {
       if (value.view !== Gerrit.Nav.View.DIFF) { return; }
 
-      this._loadHash(this.params.hash);
+      this._initCursor(this.params);
 
       this._changeNum = value.changeNum;
       this._patchRange = {
@@ -539,18 +537,16 @@
     },
 
     /**
-     * If the URL hash is a diff address then configure the diff cursor.
+     * If the params specify a diff address then configure the diff cursor.
      */
-    _loadHash(hash) {
-      hash = (hash || '').replace(/^#/, '');
-      if (!HASH_PATTERN.test(hash)) { return; }
-      if (hash[0] === 'a' || hash[0] === 'b') {
+    _initCursor(params) {
+      if (params.lineNum === undefined) { return; }
+      if (params.leftSide) {
         this.$.cursor.side = DiffSides.LEFT;
-        hash = hash.substring(1);
       } else {
         this.$.cursor.side = DiffSides.RIGHT;
       }
-      this.$.cursor.initialLineNumber = parseInt(hash, 10);
+      this.$.cursor.initialLineNumber = params.lineNum;
     },
 
     _pathChanged(path) {
diff --git a/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view_test.html b/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view_test.html
index 250e0f5..e239bf0 100644
--- a/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view_test.html
+++ b/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view_test.html
@@ -509,7 +509,7 @@
         getDiffComments() { return Promise.resolve({}); },
       });
       sandbox.stub(element.$.diff, 'reload');
-      sandbox.stub(element, '_loadHash');
+      sandbox.stub(element, '_initCursor');
 
       element._loggedIn = true;
       element.params = {
@@ -522,7 +522,7 @@
       };
 
       flush(() => {
-        assert.isTrue(element._loadHash.lastCall.calledWithExactly(10));
+        assert.isTrue(element._initCursor.calledOnce);
         done();
       });
     });
@@ -573,31 +573,31 @@
       assert.equal(select.nativeSelect.value, 'SIDE_BY_SIDE');
     });
 
-    test('_loadHash', () => {
+    test('_initCursor', () => {
       assert.isNotOk(element.$.cursor.initialLineNumber);
 
-      // Ignores invalid hashes:
-      element._loadHash('not valid');
+      // Does nothing when params specify no cursor address:
+      element._initCursor({});
       assert.isNotOk(element.$.cursor.initialLineNumber);
 
-      // Ignores null hash:
-      element._loadHash(null);
+      // Does nothing when params specify side but no number:
+      element._initCursor({leftSide: true});
       assert.isNotOk(element.$.cursor.initialLineNumber);
 
-      // Revision hash:
-      element._loadHash('234');
+      // Revision hash: specifies lineNum but not side.
+      element._initCursor({lineNum: 234});
       assert.equal(element.$.cursor.initialLineNumber, 234);
       assert.equal(element.$.cursor.side, 'right');
 
-      // Base hash:
-      element._loadHash('b345');
+      // Base hash: specifies lineNum and side.
+      element._initCursor({leftSide: true, lineNum: 345});
       assert.equal(element.$.cursor.initialLineNumber, 345);
       assert.equal(element.$.cursor.side, 'left');
 
-      // GWT-style base hash:
-      element._loadHash('a123');
+      // Specifies right side:
+      element._initCursor({leftSide: false, lineNum: 123});
       assert.equal(element.$.cursor.initialLineNumber, 123);
-      assert.equal(element.$.cursor.side, 'left');
+      assert.equal(element.$.cursor.side, 'right');
     });
 
     test('_shortenPath with long path should add ellipsis', () => {