diff --git a/src/dxvk/dxvk_bind_mask.h b/src/dxvk/dxvk_bind_mask.h
index 57931064e..cabebaa1b 100644
--- a/src/dxvk/dxvk_bind_mask.h
+++ b/src/dxvk/dxvk_bind_mask.h
@@ -178,9 +178,6 @@ namespace dxvk {
     
   };
 
-  using DxvkBindingMask = DxvkBindingSet<MaxNumActiveBindings>;
-  
-  
   /**
    * \brief Bound shader resources
    * 
diff --git a/src/dxvk/dxvk_limits.h b/src/dxvk/dxvk_limits.h
index eb2431e68..d197acb78 100644
--- a/src/dxvk/dxvk_limits.h
+++ b/src/dxvk/dxvk_limits.h
@@ -12,7 +12,6 @@ namespace dxvk {
     MaxNumXfbStreams            =     4,
     MaxNumViewports             =    16,
     MaxNumResourceSlots         =  1216,
-    MaxNumActiveBindings        =   384,
     MaxNumQueuedCommandBuffers  =    18,
     MaxNumQueryCountPerPool     =   128,
     MaxNumSpecConstants         =    12,
diff --git a/src/dxvk/dxvk_state_cache.cpp b/src/dxvk/dxvk_state_cache.cpp
index 770fedc5a..92962dacf 100644
--- a/src/dxvk/dxvk_state_cache.cpp
+++ b/src/dxvk/dxvk_state_cache.cpp
@@ -44,19 +44,14 @@ namespace dxvk {
       return read(data);
     }
 
-    bool read(DxvkBindingMask& data, uint32_t version) {
+    bool read(DxvkBindingMaskV10& data, uint32_t version) {
       // v11 removes this field
       if (version >= 11)
         return true;
 
       if (version < 9) {
         DxvkBindingMaskV8 v8;
-
-        if (!read(v8))
-          return false;
-
-        data = v8.convert();
-        return true;
+        return read(v8);
       }
 
       return read(data);
@@ -577,7 +572,7 @@ namespace dxvk {
         keys[i] = g_nullShaderKey;
     }
 
-    DxvkBindingMask dummyBindingMask = { };
+    DxvkBindingMaskV10 dummyBindingMask = { };
 
     if (stageMask & VK_SHADER_STAGE_COMPUTE_BIT) {
       if (!data.read(dummyBindingMask, version))
diff --git a/src/dxvk/dxvk_state_cache_types.h b/src/dxvk/dxvk_state_cache_types.h
index e12ca5d07..d257325a4 100644
--- a/src/dxvk/dxvk_state_cache_types.h
+++ b/src/dxvk/dxvk_state_cache_types.h
@@ -58,19 +58,8 @@ namespace dxvk {
 
   static_assert(sizeof(DxvkStateCacheHeader) == 12);
 
-
-  class DxvkBindingMaskV8 : DxvkBindingSet<128> {
-
-  public:
-
-    DxvkBindingMask convert() const {
-      DxvkBindingMask result = { };
-      for (uint32_t i = 0; i < 128; i++)
-        result.set(i, test(i));
-      return result;
-    }
-
-  };
+  using DxvkBindingMaskV10 = DxvkBindingSet<384>;
+  using DxvkBindingMaskV8 = DxvkBindingSet<128>;
 
   class DxvkIlBindingV9 {