diff --git a/src/dawn_native/ShaderModule.cpp b/src/dawn_native/ShaderModule.cpp
index 1ae9379884..96b97d9d90 100644
--- a/src/dawn_native/ShaderModule.cpp
+++ b/src/dawn_native/ShaderModule.cpp
@@ -1102,9 +1102,7 @@ namespace dawn_native {
         transformManager.append(std::make_unique<tint::transform::EmitVertexPointSize>());
         transformManager.append(std::make_unique<tint::transform::Spirv>());
         if (GetDevice()->IsRobustnessEnabled()) {
-            // TODO(enga): Run the Tint BoundArrayAccessors transform instead of the SPIRV Tools
-            // one, but it appears to crash after running VertexPulling.
-            // transformManager.append(std::make_unique<tint::transform::BoundArrayAccessors>());
+            transformManager.append(std::make_unique<tint::transform::BoundArrayAccessors>());
         }
 
         tint::Program program;
@@ -1117,9 +1115,6 @@ namespace dawn_native {
         }
 
         std::vector<uint32_t> spirv = generator.result();
-        if (GetDevice()->IsRobustnessEnabled()) {
-            DAWN_TRY_ASSIGN(spirv, RunRobustBufferAccessPass(spirv));
-        }
         DAWN_TRY(ValidateSpirv(spirv.data(), spirv.size()));
         return std::move(spirv);
     }