diff --git a/clang/lib/CodeGen/CGCall.cpp b/clang/lib/CodeGen/CGCall.cpp
index 717499cb1492..6ed9d0e8c48e 100644
--- a/clang/lib/CodeGen/CGCall.cpp
+++ b/clang/lib/CodeGen/CGCall.cpp
@@ -2242,9 +2242,6 @@ void CodeGenModule::ConstructAttributeList(StringRef Name,
     if (TargetDecl->hasAttr<HyperViewAttr>()) {
       FuncAttrs.addAttribute(llvm::Attribute::HyperView);
     }
-    else if (TargetDecl->hasAttr<HyperTokenAttr>()) {
-      FuncAttrs.addAttribute(llvm::Attribute::HyperToken);
-    }
     if (TargetDecl->hasAttr<RestrictAttr>())
       RetAttrs.addAttribute(llvm::Attribute::NoAlias);
     else if (TargetDecl->hasAttr<StrandMallocAttr>())
diff --git a/llvm/include/llvm/Bitcode/LLVMBitCodes.h b/llvm/include/llvm/Bitcode/LLVMBitCodes.h
index e62db811cbe7..cde787442820 100644
--- a/llvm/include/llvm/Bitcode/LLVMBitCodes.h
+++ b/llvm/include/llvm/Bitcode/LLVMBitCodes.h
@@ -721,9 +721,8 @@ enum AttributeKindCodes {
   ATTR_KIND_STRAND_NO_ALIAS = 90,
   ATTR_KIND_INJECTIVE = 91,
   ATTR_KIND_HYPER_VIEW = 92,
-  ATTR_KIND_HYPER_TOKEN = 93,
-  ATTR_KIND_REDUCER_REGISTER = 94,
-  ATTR_KIND_REDUCER_UNREGISTER = 95,
+  ATTR_KIND_REDUCER_REGISTER = 93,
+  ATTR_KIND_REDUCER_UNREGISTER = 94,
 };
 
 enum ComdatSelectionKindCodes {
diff --git a/llvm/include/llvm/IR/Attributes.td b/llvm/include/llvm/IR/Attributes.td
index a8510695aeb5..011ef4283e03 100644
--- a/llvm/include/llvm/IR/Attributes.td
+++ b/llvm/include/llvm/IR/Attributes.td
@@ -217,7 +217,6 @@ def ReadOnly : EnumAttr<"readonly", [ParamAttr]>;
 
 /// Tapir reducer-related attributes.
 def HyperView : EnumAttr<"hyper_view", [FnAttr]>;
-def HyperToken : EnumAttr<"hyper_token", [FnAttr]>;
 def ReducerRegister : EnumAttr<"reducer_register", [FnAttr]>;
 def ReducerUnregister : EnumAttr<"reducer_unregister", [FnAttr]>;
 
diff --git a/llvm/lib/Bitcode/Reader/BitcodeReader.cpp b/llvm/lib/Bitcode/Reader/BitcodeReader.cpp
index 4737affd95eb..07ea175a34f6 100644
--- a/llvm/lib/Bitcode/Reader/BitcodeReader.cpp
+++ b/llvm/lib/Bitcode/Reader/BitcodeReader.cpp
@@ -2078,8 +2078,6 @@ static Attribute::AttrKind getAttrFromCode(uint64_t Code) {
     return Attribute::Injective;
   case bitc::ATTR_KIND_HYPER_VIEW:
     return Attribute::HyperView;
-  case bitc::ATTR_KIND_HYPER_TOKEN:
-    return Attribute::HyperToken;
   case bitc::ATTR_KIND_REDUCER_REGISTER:
     return Attribute::ReducerRegister;
   case bitc::ATTR_KIND_REDUCER_UNREGISTER:
diff --git a/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp b/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp
index a1f46474ee41..88ac8fbf56e7 100644
--- a/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp
+++ b/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp
@@ -817,8 +817,6 @@ static uint64_t getAttrKindEncoding(Attribute::AttrKind Kind) {
     return bitc::ATTR_KIND_PRESPLIT_COROUTINE;
   case Attribute::Injective:
     return bitc::ATTR_KIND_INJECTIVE;
-  case Attribute::HyperToken:
-    return bitc::ATTR_KIND_HYPER_TOKEN;
   case Attribute::HyperView:
     return bitc::ATTR_KIND_HYPER_VIEW;
   case Attribute::ReducerUnregister:
diff --git a/llvm/lib/Transforms/Utils/CodeExtractor.cpp b/llvm/lib/Transforms/Utils/CodeExtractor.cpp
index 46194754ad66..a146e6dc9256 100644
--- a/llvm/lib/Transforms/Utils/CodeExtractor.cpp
+++ b/llvm/lib/Transforms/Utils/CodeExtractor.cpp
@@ -905,7 +905,6 @@ Function *CodeExtractor::constructFunction(const ValueSet &inputs,
       case Attribute::AllocSize:
       case Attribute::Builtin:
       case Attribute::Convergent:
-      case Attribute::HyperToken:
       case Attribute::HyperView:
       case Attribute::Injective:
       case Attribute::JumpTable: