diff --git a/lib/MC/MCParser/AsmLexer.cpp b/lib/MC/MCParser/AsmLexer.cpp
index f157a896091..11833127848 100644
--- a/lib/MC/MCParser/AsmLexer.cpp
+++ b/lib/MC/MCParser/AsmLexer.cpp
@@ -69,26 +69,16 @@ int AsmLexer::getNextChar() {
   }
 }
 
-/// LexIdentifier: [a-zA-Z_.$][a-zA-Z0-9_$.@]*
-/// LexIdentifier: .
-/// LexIdentifier: $
+/// LexIdentifier: [a-zA-Z_.][a-zA-Z0-9_$.@]*
 AsmToken AsmLexer::LexIdentifier() {
   while (isalnum(*CurPtr) || *CurPtr == '_' || *CurPtr == '$' ||
          *CurPtr == '.' || *CurPtr == '@')
     ++CurPtr;
   
   // Handle . as a special case.
-  if (CurPtr == TokStart+1)
-    if (TokStart[0] == '.')
-      return AsmToken(AsmToken::Dot, StringRef(TokStart, 1));
-
-  // Handle $ as a special case. $foo is an identifier, $42 is not.
-  if (TokStart[0] == '$' &&
-      (CurPtr-TokStart == 1 || isdigit(TokStart[1]) || TokStart[1] == '"')) {
-    CurPtr = TokStart+1;
-    return AsmToken(AsmToken::Dollar, StringRef(TokStart, 1));
-  }
-
+  if (CurPtr == TokStart+1 && TokStart[0] == '.')
+    return AsmToken(AsmToken::Dot, StringRef(TokStart, 1));
+  
   return AsmToken(AsmToken::Identifier, StringRef(TokStart, CurPtr - TokStart));
 }
 
@@ -262,8 +252,8 @@ AsmToken AsmLexer::LexToken() {
 
   switch (CurChar) {
   default:
-    // Handle identifier: [a-zA-Z_.$][a-zA-Z0-9_$.@]*
-    if (isalpha(CurChar) || CurChar == '_' || CurChar == '.' || CurChar == '$')
+    // Handle identifier: [a-zA-Z_.][a-zA-Z0-9_$.@]*
+    if (isalpha(CurChar) || CurChar == '_' || CurChar == '.')
       return LexIdentifier();
     
     // Unknown character, emit an error.
@@ -289,6 +279,7 @@ AsmToken AsmLexer::LexToken() {
   case '}': return AsmToken(AsmToken::RCurly, StringRef(TokStart, 1));
   case '*': return AsmToken(AsmToken::Star, StringRef(TokStart, 1));
   case ',': return AsmToken(AsmToken::Comma, StringRef(TokStart, 1));
+  case '$': return AsmToken(AsmToken::Dollar, StringRef(TokStart, 1));
   case '=': 
     if (*CurPtr == '=')
       return ++CurPtr, AsmToken(AsmToken::EqualEqual, StringRef(TokStart, 2));
diff --git a/test/MC/AsmParser/X86/x86_operands.s b/test/MC/AsmParser/X86/x86_operands.s
index cd54a0bb0f6..bf958d8478c 100644
--- a/test/MC/AsmParser/X86/x86_operands.s
+++ b/test/MC/AsmParser/X86/x86_operands.s
@@ -1,3 +1,5 @@
+// FIXME: Actually test that we get the expected results.
+        
 // RUN: llvm-mc -triple i386-unknown-unknown %s | FileCheck %s
 
 # Immediates
@@ -5,7 +7,7 @@
         addl $1, %eax
 # CHECK: addl $3, %eax
         addl $(1+2), %eax
-# CHECK: addl ($a), %eax
+# CHECK: addl $a, %eax
         addl $a, %eax
 # CHECK: addl $3, %eax
         addl $1 + 2, %eax
diff --git a/test/MC/AsmParser/labels.s b/test/MC/AsmParser/labels.s
index c5a064fce25..3bc7e630ce4 100644
--- a/test/MC/AsmParser/labels.s
+++ b/test/MC/AsmParser/labels.s
@@ -57,10 +57,3 @@ foo:
 
 // CHECK: .long "a 9"
         .long "a 9"
-
-
-// rdar://7946934
-// CHECK: .globl $abc
-        .globl $abc
-        
-        
\ No newline at end of file