diff --git a/renderdoc/driver/shaders/spirv/spirv_debug_setup.cpp b/renderdoc/driver/shaders/spirv/spirv_debug_setup.cpp
index 2db69af03..ef5df334e 100644
--- a/renderdoc/driver/shaders/spirv/spirv_debug_setup.cpp
+++ b/renderdoc/driver/shaders/spirv/spirv_debug_setup.cpp
@@ -33,10 +33,6 @@
 RDOC_CONFIG(bool, Vulkan_Debug_UseDebugColumnInformation, false,
             "Control whether column information should be read from vulkan debug info.");
 
-RDOC_DEBUG_CONFIG(
-    bool, Vulkan_Hack_EnableGroupCaps, false,
-    "Work in progress allow shaders to be debugged with subgroup/workgroup requirements.");
-
 RDOC_CONFIG(bool, Vulkan_Debug_EnableShaderDebugMT, true,
             "Use multiple threads to run the shader debugger simulation.");
 
@@ -644,14 +640,7 @@ void Reflector::CheckDebuggable(bool &debuggable, rdcstr &debugStatus) const
       case Capability::GroupNonUniformRotateKHR:
       case Capability::GroupNonUniformArithmetic:
       {
-        if(Vulkan_Hack_EnableGroupCaps())
-        {
-          supported = true;
-        }
-        else
-        {
-          supported = false;
-        }
+        supported = true;
         break;
       }
 
diff --git a/renderdoc/driver/vulkan/vk_shaderdebug.cpp b/renderdoc/driver/vulkan/vk_shaderdebug.cpp
index 2b6c91581..158b11db0 100644
--- a/renderdoc/driver/vulkan/vk_shaderdebug.cpp
+++ b/renderdoc/driver/vulkan/vk_shaderdebug.cpp
@@ -39,7 +39,6 @@ RDOC_CONFIG(rdcstr, Vulkan_Debug_PSDebugDumpDirPath, "",
             "Path to dump shader debugging generated SPIR-V files.");
 RDOC_CONFIG(bool, Vulkan_Debug_ShaderDebugLogging, false,
             "Output verbose debug logging messages when debugging shaders.");
-RDOC_EXTERN_CONFIG(bool, Vulkan_Hack_EnableGroupCaps);
 
 // needed for old linux compilers
 namespace std
@@ -6441,10 +6440,7 @@ ShaderDebugTrace *VulkanReplay::DebugComputeCommon(ShaderStage stage, uint32_t e
   if(shadRefl.patchData.threadScope & rdcspv::ThreadScope::Subgroup)
     numThreads = RDCMAX(numThreads, maxSubgroupSize);
   if(shadRefl.patchData.threadScope & rdcspv::ThreadScope::Workgroup)
-  {
-    if(Vulkan_Hack_EnableGroupCaps())
-      numThreads = RDCMAX(numThreads, threadDim[0] * threadDim[1] * threadDim[2]);
-  }
+    numThreads = RDCMAX(numThreads, threadDim[0] * threadDim[1] * threadDim[2]);
 
   apiWrapper->thread_builtins.resize(numThreads);
   apiWrapper->thread_props.resize(numThreads);