diff -r c2163c885896 go/lex.cc
--- a/go/lex.cc	Sun Dec 02 19:23:21 2012 -0800
+++ b/go/lex.cc	Sun Dec 02 22:49:14 2012 -0800
@@ -915,12 +915,8 @@
 	    }
 	  if (is_invalid && !Lex::is_invalid_identifier(buf))
 	    buf.append("$INVALID$");
+	  buf.append(p, pnext - p);
 	  p = pnext;
-	  char ubuf[50];
-	  // This assumes that all assemblers can handle an identifier
-	  // with a '$' character.
-	  snprintf(ubuf, sizeof ubuf, "$U%x$", ci);
-	  buf.append(ubuf);
 	}
     }
   Location location = this->location();