diff --git a/polaris-core/src/main/java/org/apache/polaris/core/context/CallContext.java b/polaris-core/src/main/java/org/apache/polaris/core/context/CallContext.java
index 7164cfc752..28ec97ba6c 100644
--- a/polaris-core/src/main/java/org/apache/polaris/core/context/CallContext.java
+++ b/polaris-core/src/main/java/org/apache/polaris/core/context/CallContext.java
@@ -30,21 +30,6 @@
  * underlying nature of the persistence layer may differ between different realms.
  */
 public interface CallContext {
-  InheritableThreadLocal<CallContext> CURRENT_CONTEXT = new InheritableThreadLocal<>();
-
-  static CallContext setCurrentContext(CallContext context) {
-    CURRENT_CONTEXT.set(context);
-    return context;
-  }
-
-  static CallContext getCurrentContext() {
-    return CURRENT_CONTEXT.get();
-  }
-
-  static void unsetCurrentContext() {
-    CURRENT_CONTEXT.remove();
-  }
-
   /** Copy the {@link CallContext}. */
   CallContext copy();
 
diff --git a/runtime/service/src/test/java/org/apache/polaris/service/quarkus/catalog/AbstractIcebergCatalogViewTest.java b/runtime/service/src/test/java/org/apache/polaris/service/quarkus/catalog/AbstractIcebergCatalogViewTest.java
index 7c587f7bc8..55ada40885 100644
--- a/runtime/service/src/test/java/org/apache/polaris/service/quarkus/catalog/AbstractIcebergCatalogViewTest.java
+++ b/runtime/service/src/test/java/org/apache/polaris/service/quarkus/catalog/AbstractIcebergCatalogViewTest.java
@@ -45,7 +45,6 @@
 import org.apache.polaris.core.auth.PolarisAuthorizerImpl;
 import org.apache.polaris.core.config.FeatureConfiguration;
 import org.apache.polaris.core.config.PolarisConfigurationStore;
-import org.apache.polaris.core.context.CallContext;
 import org.apache.polaris.core.context.RealmContext;
 import org.apache.polaris.core.entity.CatalogEntity;
 import org.apache.polaris.core.entity.PrincipalEntity;
@@ -167,8 +166,6 @@ public void before(TestInfo testInfo) {
     PolarisEntityManager entityManager =
         new PolarisEntityManager(metaStoreManager, resolverFactory);
 
-    CallContext.setCurrentContext(polarisContext);
-
     PrincipalEntity rootPrincipal =
         metaStoreManager.findRootPrincipal(polarisContext).orElseThrow();
     AuthenticatedPolarisPrincipal authenticatedRoot =
diff --git a/runtime/service/src/test/java/org/apache/polaris/service/quarkus/test/PolarisIntegrationTestFixture.java b/runtime/service/src/test/java/org/apache/polaris/service/quarkus/test/PolarisIntegrationTestFixture.java
index a01d4b5d2b..485195a464 100644
--- a/runtime/service/src/test/java/org/apache/polaris/service/quarkus/test/PolarisIntegrationTestFixture.java
+++ b/runtime/service/src/test/java/org/apache/polaris/service/quarkus/test/PolarisIntegrationTestFixture.java
@@ -36,7 +36,6 @@
 import org.apache.polaris.core.admin.model.Principal;
 import org.apache.polaris.core.admin.model.PrincipalRole;
 import org.apache.polaris.core.admin.model.PrincipalWithCredentials;
-import org.apache.polaris.core.context.CallContext;
 import org.apache.polaris.core.context.RealmContext;
 import org.apache.polaris.core.entity.PolarisPrincipalSecrets;
 import org.apache.polaris.core.entity.PrincipalEntity;
@@ -116,17 +115,13 @@ private PolarisPrincipalSecrets fetchAdminSecrets() {
             helper.diagServices,
             helper.configurationStore,
             helper.clock);
-    try {
-      PolarisMetaStoreManager metaStoreManager =
-          helper.metaStoreManagerFactory.getOrCreateMetaStoreManager(realmContext);
-      PrincipalEntity principal = metaStoreManager.findRootPrincipal(polarisContext).orElseThrow();
-      Map<String, String> propertiesMap = readInternalProperties(principal);
-      return metaStoreManager
-          .loadPrincipalSecrets(polarisContext, propertiesMap.get("client_id"))
-          .getPrincipalSecrets();
-    } finally {
-      CallContext.unsetCurrentContext();
-    }
+    PolarisMetaStoreManager metaStoreManager =
+        helper.metaStoreManagerFactory.getOrCreateMetaStoreManager(realmContext);
+    PrincipalEntity principal = metaStoreManager.findRootPrincipal(polarisContext).orElseThrow();
+    Map<String, String> propertiesMap = readInternalProperties(principal);
+    return metaStoreManager
+        .loadPrincipalSecrets(polarisContext, propertiesMap.get("client_id"))
+        .getPrincipalSecrets();
   }
 
   private SnowmanCredentials createSnowmanCredentials(TestEnvironment testEnv) {
diff --git a/service/common/src/main/java/org/apache/polaris/service/admin/PolarisServiceImpl.java b/service/common/src/main/java/org/apache/polaris/service/admin/PolarisServiceImpl.java
index c9d36eb6b5..0f001d1235 100644
--- a/service/common/src/main/java/org/apache/polaris/service/admin/PolarisServiceImpl.java
+++ b/service/common/src/main/java/org/apache/polaris/service/admin/PolarisServiceImpl.java
@@ -111,8 +111,6 @@ public PolarisServiceImpl(
     this.polarisAuthorizer = polarisAuthorizer;
     this.callContext = callContext;
     this.reservedProperties = reservedProperties;
-    // FIXME: This is a hack to set the current context for downstream calls.
-    CallContext.setCurrentContext(callContext);
   }
 
   private PolarisAdminService newAdminService(
diff --git a/service/common/src/main/java/org/apache/polaris/service/catalog/generic/GenericTableCatalogAdapter.java b/service/common/src/main/java/org/apache/polaris/service/catalog/generic/GenericTableCatalogAdapter.java
index ddc03a291c..c36cb1730f 100644
--- a/service/common/src/main/java/org/apache/polaris/service/catalog/generic/GenericTableCatalogAdapter.java
+++ b/service/common/src/main/java/org/apache/polaris/service/catalog/generic/GenericTableCatalogAdapter.java
@@ -69,9 +69,6 @@ public GenericTableCatalogAdapter(
     this.polarisAuthorizer = polarisAuthorizer;
     this.prefixParser = prefixParser;
     this.reservedProperties = reservedProperties;
-
-    // FIXME: This is a hack to set the current context for downstream calls.
-    CallContext.setCurrentContext(callContext);
   }
 
   private GenericTableCatalogHandler newHandlerWrapper(
diff --git a/service/common/src/main/java/org/apache/polaris/service/catalog/policy/PolicyCatalogAdapter.java b/service/common/src/main/java/org/apache/polaris/service/catalog/policy/PolicyCatalogAdapter.java
index a549ff869c..ef000add56 100644
--- a/service/common/src/main/java/org/apache/polaris/service/catalog/policy/PolicyCatalogAdapter.java
+++ b/service/common/src/main/java/org/apache/polaris/service/catalog/policy/PolicyCatalogAdapter.java
@@ -70,9 +70,6 @@ public PolicyCatalogAdapter(
     this.metaStoreManager = metaStoreManager;
     this.polarisAuthorizer = polarisAuthorizer;
     this.prefixParser = prefixParser;
-
-    // FIXME: This is a hack to set the current context for downstream calls.
-    CallContext.setCurrentContext(callContext);
   }
 
   private PolicyCatalogHandler newHandlerWrapper(SecurityContext securityContext, String prefix) {