diff --git a/.github/workflows/scripts/kinds/verify-kinds.go b/.github/workflows/scripts/kinds/verify-kinds.go
index 0e8be14d836..b27e018fe6b 100644
--- a/.github/workflows/scripts/kinds/verify-kinds.go
+++ b/.github/workflows/scripts/kinds/verify-kinds.go
@@ -85,12 +85,6 @@ func main() {
 	}
 
 	for _, pp := range corelist.New(nil) {
-		// ElasticSearch composable kind causes the CUE evaluator to hand
-		// see https://github.com/grafana/grafana/pull/68034#discussion_r1187800059
-		if pp.Properties.Id == "elasticsearch" {
-			continue
-		}
-
 		for _, kind := range pp.ComposableKinds {
 			if len(kindArgs) > 0 && !contains(kindArgs, kind.Name()) {
 				continue
diff --git a/pkg/plugins/pfs/pfs.go b/pkg/plugins/pfs/pfs.go
index 4aeb77798de..73cb4a3f33c 100644
--- a/pkg/plugins/pfs/pfs.go
+++ b/pkg/plugins/pfs/pfs.go
@@ -196,13 +196,7 @@ func ParsePluginFS(fsys fs.FS, rt *thema.Runtime) (ParsedPlugin, error) {
 	})
 	bi.Files = append(bi.Files, f)
 
-	gpi := ctx.BuildInstance(bi)
-	// Temporary hack while we figure out what in the elasticsearch lineage turns
-	// this into an endless loop in thema, and why unifying twice is anything other
-	// than a total no-op.
-	if pp.Properties.Id != "elasticsearch" {
-		gpi = gpi.Unify(gpv)
-	}
+	gpi := ctx.BuildInstance(bi).Unify(gpv)
 	if gpi.Err() != nil {
 		return ParsedPlugin{}, errors.Wrap(errors.Promote(ErrInvalidGrafanaPluginInstance, pp.Properties.Id), gpi.Err())
 	}
diff --git a/public/app/plugins/datasource/azuremonitor/dataquery.cue b/public/app/plugins/datasource/azuremonitor/dataquery.cue
index c845291c17c..36ef1d51510 100644
--- a/public/app/plugins/datasource/azuremonitor/dataquery.cue
+++ b/public/app/plugins/datasource/azuremonitor/dataquery.cue
@@ -16,12 +16,8 @@ package grafanaplugin
 
 import (
 	common "github.com/grafana/grafana/packages/grafana-schema/src/common"
-	"github.com/grafana/grafana/pkg/plugins/pfs"
 )
 
-// This file (with its sibling .cue files) implements pfs.GrafanaPlugin
-pfs.GrafanaPlugin
-
 composableKinds: DataQuery: {
 	maturity: "merged"
 
diff --git a/public/app/plugins/datasource/cloud-monitoring/dataquery.cue b/public/app/plugins/datasource/cloud-monitoring/dataquery.cue
index 8aba4696b68..353e79061da 100644
--- a/public/app/plugins/datasource/cloud-monitoring/dataquery.cue
+++ b/public/app/plugins/datasource/cloud-monitoring/dataquery.cue
@@ -16,11 +16,8 @@ package grafanaplugin
 
 import (
 	"github.com/grafana/grafana/packages/grafana-schema/src/common"
-	"github.com/grafana/grafana/pkg/plugins/pfs"
 )
 
-pfs.GrafanaPlugin
-
 composableKinds: DataQuery: {
 	maturity: "merged"
 
diff --git a/public/app/plugins/datasource/cloudwatch/dataquery.cue b/public/app/plugins/datasource/cloudwatch/dataquery.cue
index 6b385f6f09c..bc3cb0d1821 100644
--- a/public/app/plugins/datasource/cloudwatch/dataquery.cue
+++ b/public/app/plugins/datasource/cloudwatch/dataquery.cue
@@ -16,12 +16,8 @@ package grafanaplugin
 
 import (
 	common "github.com/grafana/grafana/packages/grafana-schema/src/common"
-	"github.com/grafana/grafana/pkg/plugins/pfs"
 )
 
-// This file (with its sibling .cue files) implements pfs.GrafanaPlugin
-pfs.GrafanaPlugin
-
 composableKinds: DataQuery: {
 	maturity: "experimental"
 
diff --git a/public/app/plugins/datasource/elasticsearch/dataquery.cue b/public/app/plugins/datasource/elasticsearch/dataquery.cue
index 005a36dd16b..78dc139adf5 100644
--- a/public/app/plugins/datasource/elasticsearch/dataquery.cue
+++ b/public/app/plugins/datasource/elasticsearch/dataquery.cue
@@ -16,12 +16,8 @@ package grafanaplugin
 
 import (
 	"github.com/grafana/grafana/packages/grafana-schema/src/common"
-	"github.com/grafana/grafana/pkg/plugins/pfs"
 )
 
-// This file (with its sibling .cue files) implements pfs.GrafanaPlugin
-pfs.GrafanaPlugin
-
 composableKinds: DataQuery: {
 	maturity: "experimental"
 
diff --git a/public/app/plugins/datasource/grafana-pyroscope-datasource/dataquery.cue b/public/app/plugins/datasource/grafana-pyroscope-datasource/dataquery.cue
index 76b60978c3f..0e05134be23 100644
--- a/public/app/plugins/datasource/grafana-pyroscope-datasource/dataquery.cue
+++ b/public/app/plugins/datasource/grafana-pyroscope-datasource/dataquery.cue
@@ -16,12 +16,8 @@ package grafanaplugin
 
 import (
 	"github.com/grafana/grafana/packages/grafana-schema/src/common"
-	"github.com/grafana/grafana/pkg/plugins/pfs"
 )
 
-// This file (with its sibling .cue files) implements pfs.GrafanaPlugin
-pfs.GrafanaPlugin
-
 composableKinds: DataQuery: {
 	maturity: "experimental"
 
diff --git a/public/app/plugins/datasource/loki/dataquery.cue b/public/app/plugins/datasource/loki/dataquery.cue
index 5b948b66a61..97adc14a145 100644
--- a/public/app/plugins/datasource/loki/dataquery.cue
+++ b/public/app/plugins/datasource/loki/dataquery.cue
@@ -16,12 +16,8 @@ package grafanaplugin
 
 import (
 	"github.com/grafana/grafana/packages/grafana-schema/src/common"
-	"github.com/grafana/grafana/pkg/plugins/pfs"
 )
 
-// This file (with its sibling .cue files) implements pfs.GrafanaPlugin
-pfs.GrafanaPlugin
-
 composableKinds: DataQuery: {
 	maturity: "experimental"
 
diff --git a/public/app/plugins/datasource/parca/dataquery.cue b/public/app/plugins/datasource/parca/dataquery.cue
index b8779752484..72c64f011c6 100644
--- a/public/app/plugins/datasource/parca/dataquery.cue
+++ b/public/app/plugins/datasource/parca/dataquery.cue
@@ -16,12 +16,8 @@ package grafanaplugin
 
 import (
 	"github.com/grafana/grafana/packages/grafana-schema/src/common"
-	"github.com/grafana/grafana/pkg/plugins/pfs"
 )
 
-// This file (with its sibling .cue files) implements pfs.GrafanaPlugin
-pfs.GrafanaPlugin
-
 composableKinds: DataQuery: {
 	maturity: "experimental"
 
diff --git a/public/app/plugins/datasource/prometheus/dataquery.cue b/public/app/plugins/datasource/prometheus/dataquery.cue
index b6def66ec26..934c72263f2 100644
--- a/public/app/plugins/datasource/prometheus/dataquery.cue
+++ b/public/app/plugins/datasource/prometheus/dataquery.cue
@@ -16,12 +16,8 @@ package grafanaplugin
 
 import (
 	common "github.com/grafana/grafana/packages/grafana-schema/src/common"
-	"github.com/grafana/grafana/pkg/plugins/pfs"
 )
 
-// This file (with its sibling .cue files) implements pfs.GrafanaPlugin
-pfs.GrafanaPlugin
-
 composableKinds: DataQuery: {
 	maturity: "experimental"
 
diff --git a/public/app/plugins/datasource/tempo/dataquery.cue b/public/app/plugins/datasource/tempo/dataquery.cue
index 3a77559d9e9..ac3b19921ed 100644
--- a/public/app/plugins/datasource/tempo/dataquery.cue
+++ b/public/app/plugins/datasource/tempo/dataquery.cue
@@ -16,12 +16,8 @@ package grafanaplugin
 
 import (
 	"github.com/grafana/grafana/packages/grafana-schema/src/common"
-	"github.com/grafana/grafana/pkg/plugins/pfs"
 )
 
-// This file (with its sibling .cue files) implements pfs.GrafanaPlugin
-pfs.GrafanaPlugin
-
 composableKinds: DataQuery: {
 	maturity: "experimental"
 
diff --git a/public/app/plugins/datasource/testdata/dataquery.cue b/public/app/plugins/datasource/testdata/dataquery.cue
index fa7c5e02f7e..fd111d1c96d 100644
--- a/public/app/plugins/datasource/testdata/dataquery.cue
+++ b/public/app/plugins/datasource/testdata/dataquery.cue
@@ -16,12 +16,8 @@ package grafanaplugin
 
 import (
 	"github.com/grafana/grafana/packages/grafana-schema/src/common"
-	"github.com/grafana/grafana/pkg/plugins/pfs"
 )
 
-// This file (with its sibling .cue files) implements pfs.GrafanaPlugin
-pfs.GrafanaPlugin
-
 composableKinds: DataQuery: {
 	maturity: "experimental"
 
diff --git a/public/app/plugins/panel/debug/panelcfg.cue b/public/app/plugins/panel/debug/panelcfg.cue
index 80ce8f89867..f220cbccbb7 100644
--- a/public/app/plugins/panel/debug/panelcfg.cue
+++ b/public/app/plugins/panel/debug/panelcfg.cue
@@ -14,14 +14,6 @@
 
 package grafanaplugin
 
-import (
-	// "github.com/grafana/grafana/packages/grafana-schema/src/common"
-	"github.com/grafana/grafana/pkg/plugins/pfs"
-)
-
-// This file (with its sibling .cue files) implements pfs.GrafanaPlugin
-pfs.GrafanaPlugin
-
 composableKinds: PanelCfg: {
 	maturity: "experimental"
 
diff --git a/public/app/plugins/panel/xychart/panelcfg.cue b/public/app/plugins/panel/xychart/panelcfg.cue
index 1b12fc4b684..6e260de16b8 100644
--- a/public/app/plugins/panel/xychart/panelcfg.cue
+++ b/public/app/plugins/panel/xychart/panelcfg.cue
@@ -16,12 +16,8 @@ package grafanaplugin
 
 import (
 	"github.com/grafana/grafana/packages/grafana-schema/src/common"
-	"github.com/grafana/grafana/pkg/plugins/pfs"
 )
 
-// This file (with its sibling .cue files) implements pfs.GrafanaPlugin
-pfs.GrafanaPlugin
-
 composableKinds: PanelCfg: {
 	maturity: "experimental"