diff --git a/compiler/rustc_query_impl/src/keys.rs b/compiler/rustc_query_impl/src/keys.rs
index b6cf79b828b..cdbf734cdbe 100644
--- a/compiler/rustc_query_impl/src/keys.rs
+++ b/compiler/rustc_query_impl/src/keys.rs
@@ -565,11 +565,11 @@ impl Key for HirId {
     }
 
     fn default_span(&self, tcx: TyCtxt<'_>) -> Span {
-        self.owner.default_span(tcx)
+        tcx.hir().span(*self)
     }
 
     #[inline(always)]
     fn key_as_def_id(&self) -> Option<DefId> {
-        Some(self.owner.to_def_id())
+        None
     }
 }