diff --git a/src/librustc_ast/ast.rs b/src/librustc_ast/ast.rs
index ffee454dbaca..f58a0c6deae3 100644
--- a/src/librustc_ast/ast.rs
+++ b/src/librustc_ast/ast.rs
@@ -2218,8 +2218,8 @@ impl rustc_serialize::Encodable for AttrId {
 }
 
 impl rustc_serialize::Decodable for AttrId {
-    fn decode<D: Decoder>(_: &mut D) -> Result<AttrId, D::Error> {
-        Ok(crate::attr::mk_attr_id())
+    fn decode<D: Decoder>(d: &mut D) -> Result<AttrId, D::Error> {
+        d.read_nil().map(|_| crate::attr::mk_attr_id())
     }
 }