diff --git a/lib/data_layer.ex b/lib/data_layer.ex
index 788d3de..e7d5bf5 100644
--- a/lib/data_layer.ex
+++ b/lib/data_layer.ex
@@ -725,9 +725,9 @@ defmodule AshPostgres.DataLayer do
     |> add_timeout(timeout)
   end
 
-  defp repo_opts(repo, timeout, tenant, resource) do
+  defp repo_opts(_repo, timeout, tenant, resource) do
     if Ash.Resource.Info.multitenancy_strategy(resource) == :context do
-      [prefix: repo.tenant_to_schema(tenant)]
+      [prefix: tenant]
     else
       if schema = AshPostgres.DataLayer.Info.schema(resource) do
         [prefix: schema]
@@ -1385,20 +1385,16 @@ defmodule AshPostgres.DataLayer do
           %{
             data_layer_query
             | prefix:
-                repo.tenant_to_schema(
-                  query_tenant || AshPostgres.DataLayer.Info.schema(resource) ||
-                    config[:default_prefix] ||
-                    "public"
-                )
+                query_tenant || AshPostgres.DataLayer.Info.schema(resource) ||
+                  config[:default_prefix] ||
+                  "public"
           }
         else
           %{
             data_layer_query
             | prefix:
-                repo.tenant_to_schema(
-                  AshPostgres.DataLayer.Info.schema(resource) || config[:default_prefix] ||
-                    "public"
-                )
+                AshPostgres.DataLayer.Info.schema(resource) || config[:default_prefix] ||
+                  "public"
           }
         end
     end
diff --git a/test/support/resources/post.ex b/test/support/resources/post.ex
index c6fc265..6c21a51 100644
--- a/test/support/resources/post.ex
+++ b/test/support/resources/post.ex
@@ -171,8 +171,11 @@ defmodule AshPostgres.Test.Post do
   end
 
   code_interface do
+    define(:create, args: [:title])
     define(:get_by_id, action: :read, get_by: [:id])
     define(:increment_score, args: [{:optional, :amount}])
+    define(:destroy)
+    define(:bulk_create, bulk?: true, action: :create)
   end
 
   relationships do