diff --git a/renderdoc/3rdparty/glslang/SPIRV/GlslangToSpv.cpp b/renderdoc/3rdparty/glslang/SPIRV/GlslangToSpv.cpp
index ceea1e2b1..3eac8334f 100644
--- a/renderdoc/3rdparty/glslang/SPIRV/GlslangToSpv.cpp
+++ b/renderdoc/3rdparty/glslang/SPIRV/GlslangToSpv.cpp
@@ -2590,12 +2590,15 @@ spv::Id TGlslangToSpvTraverser::createImageTextureFunctionCall(glslang::TIntermO
             bias = true;
     }
 
+    // Temporarily hacked out as it breaks on nvidia's driver
+    /*
     // See if the sampler param should really be just the SPV image part
     if (cracked.fetch) {
         // a fetch needs to have the image extracted first
         if (builder.isSampledImage(params.sampler))
             params.sampler = builder.createUnaryOp(spv::OpImage, builder.getImageType(params.sampler), params.sampler);
     }
+    */
 
     // set the rest of the arguments
 
diff --git a/renderdoc/driver/vulkan/vk_debug.cpp b/renderdoc/driver/vulkan/vk_debug.cpp
index 5c33dfc1a..1b398573a 100644
--- a/renderdoc/driver/vulkan/vk_debug.cpp
+++ b/renderdoc/driver/vulkan/vk_debug.cpp
@@ -1417,8 +1417,10 @@ VulkanDebugManager::VulkanDebugManager(WrappedVulkan *driver, VkDevice dev)
 
   if(m_pDriver->IsNV())
   {
-    // at time of writing, this isn't fixed on nv
-    texelFetchBrokenDriver = true;
+    // at time of writing, this isn't fixed on nv, but since we have a workaround
+    // that is harmless on other IHVs - keep it supported. Once a fixed version is
+    // out we will use this + a version check to stay working on older drivers.
+    // texelFetchBrokenDriver = true;
   }
 
   if(m_pDriver->IsAMD())