diff --git a/front_end/devtools_compatibility.js b/front_end/devtools_compatibility.js
index 812722b0ba..4850ca60c9 100644
--- a/front_end/devtools_compatibility.js
+++ b/front_end/devtools_compatibility.js
@@ -1211,25 +1211,6 @@
     if (window.location.search.indexOf('remoteFrontend') === -1)
       return;
 
-    // Support for legacy (<M65) frontends.
-    /** @type {(!function(number, number):Element|undefined)} */
-    ShadowRoot.prototype.__originalShadowRootElementFromPoint;
-
-    if (!ShadowRoot.prototype.__originalShadowRootElementFromPoint) {
-      ShadowRoot.prototype.__originalShadowRootElementFromPoint = ShadowRoot.prototype.elementFromPoint;
-      /**
-       *  @param {number} x
-       *  @param {number} y
-       *  @return {Element}
-       */
-      ShadowRoot.prototype.elementFromPoint = function(x, y) {
-        var originalResult = ShadowRoot.prototype.__originalShadowRootElementFromPoint.apply(this, arguments);
-        if (this.host && originalResult === this.host)
-          return null;
-        return originalResult;
-      };
-    }
-
     // Support for legacy (<M53) frontends.
     if (!window.KeyboardEvent.prototype.hasOwnProperty('keyIdentifier')) {
       Object.defineProperty(window.KeyboardEvent.prototype, 'keyIdentifier', {
diff --git a/front_end/dom_extension/DOMExtension.js b/front_end/dom_extension/DOMExtension.js
index 2f45493acb..f38a882138 100644
--- a/front_end/dom_extension/DOMExtension.js
+++ b/front_end/dom_extension/DOMExtension.js
@@ -755,7 +755,7 @@ Document.prototype.deepElementFromPoint = function(x, y) {
   var node = null;
   while (container) {
     var innerNode = container.elementFromPoint(x, y);
-    if (!innerNode || node === innerNode)
+    if (!innerNode)
       break;
     node = innerNode;
     container = node.shadowRoot;