diff --git a/.pick_status.json b/.pick_status.json
index 9f0389006b5..0d72c2bd3ca 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1921,7 +1921,7 @@
         "description": "clover/spirv: Don't call llvm::regularizeLlvmForSpirv",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "2043c5f37cf1f1b64a8f5d9ae04bbf8e7860f616"
     },
diff --git a/src/gallium/frontends/clover/llvm/invocation.cpp b/src/gallium/frontends/clover/llvm/invocation.cpp
index 95a9d036622..bedba9fa5b7 100644
--- a/src/gallium/frontends/clover/llvm/invocation.cpp
+++ b/src/gallium/frontends/clover/llvm/invocation.cpp
@@ -439,11 +439,6 @@ clover::llvm::compile_to_spirv(const std::string &source,
       debug::log(".ll", print_module_bitcode(*mod));
 
    std::string error_msg;
-   if (!::llvm::regularizeLlvmForSpirv(mod.get(), error_msg)) {
-      r_log += "Failed to regularize LLVM IR for SPIR-V: " + error_msg + ".\n";
-      throw error(CL_INVALID_VALUE);
-   }
-
    std::ostringstream os;
    if (!::llvm::writeSpirv(mod.get(), os, error_msg)) {
       r_log += "Translation from LLVM IR to SPIR-V failed: " + error_msg + ".\n";