diff --git a/lib/SPIRV/SPIRVWriter.cpp b/lib/SPIRV/SPIRVWriter.cpp
index 9e4615aed..8d10eee14 100644
--- a/lib/SPIRV/SPIRVWriter.cpp
+++ b/lib/SPIRV/SPIRVWriter.cpp
@@ -882,13 +882,6 @@ SPIRVType *LLVMToSPIRVBase::transScavengedType(Value *V) {
                                    SPIRVEC_UnsupportedVarArgFunction);
 
     SPIRVType *RT = transType(FnTy->getReturnType());
-    // TODO: Replace this AMD intrinsic-only rewrite to Constant AS with a
-    // generic handling of AS mismatches around `Constant`.
-    if (M->getTargetTriple().getVendor() == Triple::VendorType::AMD &&
-        F->isIntrinsic())
-      if (F->getReturnType()->isPtrOrPtrVectorTy())
-        RT = transType(F->getReturnType()->getWithNewType(
-            PointerType::get(F->getContext(), SPIRAS_Constant)));
 
     std::vector<SPIRVType *> PT;
     for (Argument &Arg : F->args()) {