diff --git a/unittests/Option/OptionParsingTest.cpp b/unittests/Option/OptionParsingTest.cpp
index 101568a567e..2a5a5a9c947 100644
--- a/unittests/Option/OptionParsingTest.cpp
+++ b/unittests/Option/OptionParsingTest.cpp
@@ -17,8 +17,6 @@
 using namespace llvm;
 using namespace llvm::opt;
 
-#define SUPPORT_ALIASARGS // FIXME: Remove when no longer necessary.
-
 enum ID {
   OPT_INVALID = 0, // This is not an option ID.
 #define OPTION(PREFIX, NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, FLAGS, PARAM, \
diff --git a/utils/TableGen/OptParserEmitter.cpp b/utils/TableGen/OptParserEmitter.cpp
index d37939f635d..86328bf18f5 100644
--- a/utils/TableGen/OptParserEmitter.cpp
+++ b/utils/TableGen/OptParserEmitter.cpp
@@ -152,22 +152,11 @@ void EmitOptParser(RecordKeeper &Records, raw_ostream &OS) {
   OS << "/////////\n";
   OS << "// Groups\n\n";
   OS << "#ifdef OPTION\n";
-
-  // FIXME: Remove when option parsing clients are updated.
-  OS << "#ifdef SUPPORT_ALIASARGS\n";
-  OS << "#define OPTIONX OPTION\n";
-  OS << "#else\n";
-  OS << "#define OPTIONX(prefix, name, id, kind, group, alias, aliasargs, "
-     << "flags, param, helptext, metavar) "
-     << "OPTION(prefix, name, id, kind, "
-     << "group, alias, flags, param, helptext, metavar)\n";
-  OS << "#endif\n";
-
   for (unsigned i = 0, e = Groups.size(); i != e; ++i) {
     const Record &R = *Groups[i];
 
     // Start a single option entry.
-    OS << "OPTIONX(";
+    OS << "OPTION(";
 
     // The option prefix;
     OS << "0";
@@ -210,7 +199,7 @@ void EmitOptParser(RecordKeeper &Records, raw_ostream &OS) {
     const Record &R = *Opts[i];
 
     // Start a single option entry.
-    OS << "OPTIONX(";
+    OS << "OPTION(";
 
     // The option prefix;
     std::vector<std::string> prf = R.getValueAsListOfStrings("Prefixes");
@@ -287,7 +276,6 @@ void EmitOptParser(RecordKeeper &Records, raw_ostream &OS) {
 
     OS << ")\n";
   }
-  OS << "#undef OPTIONX\n"; // FIXME: Remove when option clients are updated.
   OS << "#endif\n";
 }
 } // end namespace llvm