3 files changed, 6 insertions, 5 deletions
diff --git a/src/buildtool/execution_api/local/TARGETS b/src/buildtool/execution_api/local/TARGETS
index 32d04697..66a57f21 100644
--- a/src/buildtool/execution_api/local/TARGETS
+++ b/src/buildtool/execution_api/local/TARGETS
@@ -30,6 +30,7 @@
     , ["src/buildtool/common", "bazel_types"]
     , ["src/buildtool/common", "artifact_digest_factory"]
     , ["src/buildtool/common", "config"]
+    , ["src/buildtool/common", "protocol_traits"]
     , ["src/buildtool/storage", "storage"]
     , ["src/buildtool/execution_api/common", "common"]
     , ["src/buildtool/execution_api/common", "artifact_blob_container"]
@@ -37,7 +38,6 @@
     , ["src/buildtool/execution_api/bazel_msg", "bazel_msg_factory"]
     , ["src/buildtool/execution_api/git", "git"]
     , ["src/buildtool/file_system", "file_system_manager"]
-    , ["src/buildtool/compatibility", "compatibility"]
     , ["src/buildtool/execution_api/bazel_msg", "bazel_msg"]
     , ["src/buildtool/logging", "log_level"]
     , ["src/buildtool/logging", "logging"]
diff --git a/src/buildtool/execution_api/local/local_action.cpp b/src/buildtool/execution_api/local/local_action.cpp
index 97507d35..701acea4 100644
--- a/src/buildtool/execution_api/local/local_action.cpp
+++ b/src/buildtool/execution_api/local/local_action.cpp
@@ -70,7 +70,7 @@ class BuildCleanupAnchor {
         [&cas](std::string const& content) -> std::optional<ArtifactDigest> {
         return cas.StoreBlob(content);
     };
-    return Compatibility::IsCompatible()
+    return ProtocolTraits::Instance().IsCompatible()
                ? BazelMsgFactory::CreateDirectoryDigestFromLocalTree(
                      dir_path, store_blob, store_tree, store_symlink)
                : BazelMsgFactory::CreateGitTreeDigestFromLocalTree(
diff --git a/src/buildtool/execution_api/local/local_api.hpp b/src/buildtool/execution_api/local/local_api.hpp
index b3e7808d..75f2d578 100644
--- a/src/buildtool/execution_api/local/local_api.hpp
+++ b/src/buildtool/execution_api/local/local_api.hpp
@@ -32,8 +32,8 @@
 #include "gsl/gsl"
 #include "src/buildtool/common/artifact_digest.hpp"
 #include "src/buildtool/common/artifact_digest_factory.hpp"
+#include "src/buildtool/common/protocol_traits.hpp"
 #include "src/buildtool/common/repository_config.hpp"
-#include "src/buildtool/compatibility/compatibility.hpp"
 #include "src/buildtool/execution_api/bazel_msg/bazel_blob_container.hpp"
 #include "src/buildtool/execution_api/common/artifact_blob_container.hpp"
 #include "src/buildtool/execution_api/common/blob_tree.hpp"
@@ -284,7 +284,7 @@ class LocalApi final : public IExecutionApi {
             return std::nullopt;
         }
 
-        if (Compatibility::IsCompatible()) {
+        if (ProtocolTraits::Instance().IsCompatible()) {
             return CommonUploadTreeCompatible(
                 *this,
                 *build_root,
@@ -383,7 +383,8 @@ class LocalApi final : public IExecutionApi {
 
     [[nodiscard]] static auto CreateFallbackApi(
         RepositoryConfig const* repo_config) noexcept -> std::optional<GitApi> {
-        if (repo_config == nullptr or Compatibility::IsCompatible()) {
+        if (repo_config == nullptr or
+            ProtocolTraits::Instance().IsCompatible()) {
             return std::nullopt;
         }
         return GitApi{repo_config};