diff --git a/compiler/rustc_metadata/src/rmeta/decoder/cstore_impl.rs b/compiler/rustc_metadata/src/rmeta/decoder/cstore_impl.rs
index c82bed7761aa..3e63e953e446 100644
--- a/compiler/rustc_metadata/src/rmeta/decoder/cstore_impl.rs
+++ b/compiler/rustc_metadata/src/rmeta/decoder/cstore_impl.rs
@@ -152,13 +152,8 @@ fn $name<'tcx>(
                 $tcx.ensure_ok().crate_hash($def_id.krate);
             }
 
-            let cdata = rustc_data_structures::sync::FreezeReadGuard::map(CStore::from_tcx($tcx), |c| {
-                c.get_crate_data($def_id.krate).cdata
-            });
-            let $cdata = crate::creader::CrateMetadataRef {
-                cdata: &cdata,
-                cstore: &CStore::from_tcx($tcx),
-            };
+            let cstore = CStore::from_tcx($tcx);
+            let $cdata = cstore.get_crate_data($def_id.krate);
 
             $compute
         }