diff --git a/filters/openpolicyagent/openpolicyagent.go b/filters/openpolicyagent/openpolicyagent.go
index 6b45ffd2ba..16379c639d 100644
--- a/filters/openpolicyagent/openpolicyagent.go
+++ b/filters/openpolicyagent/openpolicyagent.go
@@ -75,8 +75,6 @@ type OpenPolicyAgentRegistry struct {
 	bodyReadBufferSize      int64
 
 	tracer opentracing.Tracer
-
-	preevaluationOptimization bool
 }
 
 type OpenPolicyAgentFilter interface {
@@ -762,14 +760,8 @@ func (opa *OpenPolicyAgentInstance) CreatePreparedQueryOnce(opts envoyauth.Prepa
 	opa.preparedQueryDoOnce.Do(func() {
 		regoOpts := append(opts.Opts, rego.DistributedTracingOpts(opa.DistributedTracing()))
 
-		prepareOpts := opts.PrepareOpts
-
-		if opa.registry.preevaluationOptimization {
-			prepareOpts = append(prepareOpts, rego.WithPartialEval())
-		}
-
 		pq, err := rego.New(regoOpts...).
-			PrepareForEval(context.Background(), prepareOpts...)
+			PrepareForEval(context.Background())
 
 		opa.preparedQuery = &pq
 		opa.preparedQueryErr = err