diff --git a/lib/TableGen/GenDialect.cpp b/lib/TableGen/GenDialect.cpp
index cb37077..262ba78 100644
--- a/lib/TableGen/GenDialect.cpp
+++ b/lib/TableGen/GenDialect.cpp
@@ -236,12 +236,9 @@ void llvm_dialects::genDialectDefs(raw_ostream& out, RecordKeeper& records) {
 #include "llvm/ADT/SmallString.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/StringExtras.h"
-
 #include "llvm/IR/InstrTypes.h"
 #include "llvm/IR/Instructions.h"
 #include "llvm/IR/Module.h"
-
-#include <optional>
 )";
 
   if (!noMemoryEffects()) {
diff --git a/lib/TableGen/Operations.cpp b/lib/TableGen/Operations.cpp
index 76acb18..2785d33 100644
--- a/lib/TableGen/Operations.cpp
+++ b/lib/TableGen/Operations.cpp
@@ -247,7 +247,7 @@ void AccessorBuilder::emitVarArgReplacementDefinition() const {
         if ($index > 0)
           newArgs.append(arg_begin(), arg_begin() + $index);
         newArgs.append($name.begin(), $name.end());
-        $_op *newOp = ::llvm::cast<$_op>(::llvm::CallInst::Create(getCalledFunction(), newArgs, ::std::nullopt, this->getName(), this->getIterator()));
+        $_op *newOp = ::llvm::cast<$_op>(::llvm::CallInst::Create(getCalledFunction(), newArgs, this->getName(), this->getIterator()));
         this->replaceAllUsesWith(newOp);
         this->eraseFromParent();
         return newOp;
diff --git a/test/example/generated/ExampleDialect.cpp.inc b/test/example/generated/ExampleDialect.cpp.inc
index 2463100..3800b8f 100644
--- a/test/example/generated/ExampleDialect.cpp.inc
+++ b/test/example/generated/ExampleDialect.cpp.inc
@@ -12,13 +12,10 @@
 #include "llvm/ADT/SmallString.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/StringExtras.h"
-
 #include "llvm/IR/InstrTypes.h"
 #include "llvm/IR/Instructions.h"
 #include "llvm/IR/Module.h"
 
-#include <optional>
-
 #include "llvm/Support/ModRef.h"
 
 #include "llvm/Support/raw_ostream.h"
@@ -1512,7 +1509,7 @@ instName
         if (0 > 0)
           newArgs.append(arg_begin(), arg_begin() + 0);
         newArgs.append(instName_0.begin(), instName_0.end());
-        InstNameConflictVarargsOp *newOp = ::llvm::cast<InstNameConflictVarargsOp>(::llvm::CallInst::Create(getCalledFunction(), newArgs, ::std::nullopt, this->getName(), this->getIterator()));
+        InstNameConflictVarargsOp *newOp = ::llvm::cast<InstNameConflictVarargsOp>(::llvm::CallInst::Create(getCalledFunction(), newArgs, this->getName(), this->getIterator()));
         this->replaceAllUsesWith(newOp);
         this->eraseFromParent();
         return newOp;
@@ -2253,7 +2250,7 @@ data
         if (1 > 0)
           newArgs.append(arg_begin(), arg_begin() + 1);
         newArgs.append(args.begin(), args.end());
-        WriteVarArgOp *newOp = ::llvm::cast<WriteVarArgOp>(::llvm::CallInst::Create(getCalledFunction(), newArgs, ::std::nullopt, this->getName(), this->getIterator()));
+        WriteVarArgOp *newOp = ::llvm::cast<WriteVarArgOp>(::llvm::CallInst::Create(getCalledFunction(), newArgs, this->getName(), this->getIterator()));
         this->replaceAllUsesWith(newOp);
         this->eraseFromParent();
         return newOp;