diff --git a/src/librustc/traits/error_reporting.rs b/src/librustc/traits/error_reporting.rs
index be7ecbce8af7..d5ac63431445 100644
--- a/src/librustc/traits/error_reporting.rs
+++ b/src/librustc/traits/error_reporting.rs
@@ -372,9 +372,7 @@ impl<'a, 'gcx, 'tcx> InferCtxt<'a, 'gcx, 'tcx> {
         let generics = self.tcx.generics_of(def_id);
         let self_ty = trait_ref.self_ty();
         let self_ty_str = self_ty.to_string();
-        // FIXME: remove once `Self` is accepted by the compiler
         flags.push(("_Self".to_string(), Some(self_ty_str.clone())));
-        flags.push(("Self".to_string(), Some(self_ty_str.clone())));
 
         for param in generics.types.iter() {
             let name = param.name.as_str().to_string();
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index 380170207301..9d573ea0e7c0 100644
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@ -778,13 +778,7 @@ impl<'a> Parser<'a> {
     }
 
     pub fn parse_ident_attr(&mut self) -> PResult<'a, ast::Ident> {
-        match self.token {
-            token::Ident(i) if i.name == keywords::SelfType.name() => {
-                self.bump();
-                Ok(i)
-            }
-            _ => self.parse_ident(),
-        }
+        self.parse_ident()
     }
 
     fn parse_ident_common(&mut self, recover: bool) -> PResult<'a, ast::Ident> {