diff --git a/grafana-builder/grafana.libsonnet b/grafana-builder/grafana.libsonnet
index da4f0d2fd..9b959d6ef 100644
--- a/grafana-builder/grafana.libsonnet
+++ b/grafana-builder/grafana.libsonnet
@@ -196,7 +196,7 @@
     timeShift: null,
     title: title,
     tooltip: {
-      shared: true,
+      shared: false,
       sort: 0,
       value_type: 'individual',
     },
diff --git a/prometheus-ksonnet/grafana/dashboards.libsonnet b/prometheus-ksonnet/grafana/dashboards.libsonnet
index 0be82ea53..a0ad8bd05 100644
--- a/prometheus-ksonnet/grafana/dashboards.libsonnet
+++ b/prometheus-ksonnet/grafana/dashboards.libsonnet
@@ -52,20 +52,6 @@
         dashboard {
           uid: $.uidForDashboard(filename, dashboard),
           timezone: '',
-
-          [if std.objectHas(dashboard, 'rows') then 'rows']: [
-            row {
-              panels: [
-                panel {
-                  tooltip+: {
-                    shared: false,
-                  },
-                }
-                for panel in super.panels
-              ],
-            }
-            for row in super.rows
-          ],
         }
       for filename in std.objectFields(grafanaDashboards)
     },