diff --git a/tools/llvm-mc/AsmLexer.cpp b/tools/llvm-mc/AsmLexer.cpp
index e872090..0550bb1 100644
--- a/tools/llvm-mc/AsmLexer.cpp
+++ b/tools/llvm-mc/AsmLexer.cpp
@@ -12,7 +12,6 @@
 //===----------------------------------------------------------------------===//
 
 #include "AsmLexer.h"
-#include "llvm/ADT/StringSet.h"
 #include "llvm/Support/SourceMgr.h"
 #include "llvm/Support/MemoryBuffer.h"
 #include "llvm/Config/config.h"  // for strtoull.
@@ -21,21 +20,14 @@
 #include <cstdlib>
 using namespace llvm;
 
-static StringSet<> &getSS(void *TheSS) {
-  return *(StringSet<>*)TheSS;
-}
-
 AsmLexer::AsmLexer(SourceMgr &SM) : SrcMgr(SM) {
   CurBuffer = 0;
   CurBuf = SrcMgr.getMemoryBuffer(CurBuffer);
   CurPtr = CurBuf->getBufferStart();
   TokStart = 0;
-  
-  TheStringSet = new StringSet<>();
 }
 
 AsmLexer::~AsmLexer() {
-  delete &getSS(TheStringSet);
 }
 
 SMLoc AsmLexer::getLoc() const {
@@ -107,9 +99,7 @@
          *CurPtr == '.' || *CurPtr == '@')
     ++CurPtr;
   // Unique string.
-  CurStrVal = getSS(TheStringSet).GetOrCreateValue(StringRef(TokStart, 
-                                                             CurPtr - TokStart),
-                                                   0).getKeyData();
+  CurStrVal = StringRef(TokStart, CurPtr - TokStart);
   return asmtok::Identifier;
 }
 
@@ -122,9 +112,7 @@
     ++CurPtr;
   
   // Unique string.
-  CurStrVal = getSS(TheStringSet).GetOrCreateValue(StringRef(TokStart, 
-                                                             CurPtr - TokStart),
-                                                   0).getKeyData();
+  CurStrVal = StringRef(TokStart, CurPtr - TokStart);
   return asmtok::Register;
 }
 
@@ -251,9 +239,7 @@
   }
   
   // Unique string, include quotes for now.
-  CurStrVal = getSS(TheStringSet).GetOrCreateValue(StringRef(TokStart, 
-                                                             CurPtr - TokStart),
-                                                   0).getKeyData();
+  CurStrVal = StringRef(TokStart, CurPtr - TokStart);
   return asmtok::String;
 }
 
diff --git a/tools/llvm-mc/AsmLexer.h b/tools/llvm-mc/AsmLexer.h
index c862a05..25311c8 100644
--- a/tools/llvm-mc/AsmLexer.h
+++ b/tools/llvm-mc/AsmLexer.h
@@ -59,13 +59,11 @@
   
   const char *CurPtr;
   const MemoryBuffer *CurBuf;
-  // A llvm::StringSet<>, which provides uniqued and null-terminated strings.
-  void *TheStringSet;
   
   // Information about the current token.
   const char *TokStart;
   asmtok::TokKind CurKind;
-  const char *CurStrVal;  // This is valid for Identifier.
+  StringRef CurStrVal;  // This is valid for Identifier.
   int64_t CurIntVal;
   
   /// CurBuffer - This is the current buffer index we're lexing from as managed