diff --git a/src/northbridge/intel/nehalem/raminit.c b/src/northbridge/intel/nehalem/raminit.c
index a5a6276..0549de7 100644
--- a/src/northbridge/intel/nehalem/raminit.c
+++ b/src/northbridge/intel/nehalem/raminit.c
@@ -1688,8 +1688,6 @@
 static void save_timings(struct raminfo *info)
 {
 	struct ram_training train;
-	struct mrc_data_container *mrcdata;
-	int output_len = ALIGN(sizeof(train), 16);
 	int channel, slot, rank, lane, i;
 
 	train = info->training;
@@ -1717,26 +1715,7 @@
 	printk (BIOS_SPEW, "[6e8] = %x\n", train.reg_6e8);
 
 	/* Save the MRC S3 restore data to cbmem */
-	mrcdata = cbmem_add
-	    (CBMEM_ID_MRCDATA, output_len + sizeof(struct mrc_data_container));
-
-	if (mrcdata != NULL) {
-		printk(BIOS_DEBUG, "Relocate MRC DATA from %p to %p (%u bytes)\n",
-			&train, mrcdata, output_len);
-
-		mrcdata->mrc_signature = MRC_DATA_SIGNATURE;
-		mrcdata->mrc_data_size = output_len;
-		mrcdata->reserved = 0;
-		memcpy(mrcdata->mrc_data, &train, sizeof(train));
-
-		/* Zero the unused space in aligned buffer. */
-		if (output_len > sizeof(train))
-			memset(mrcdata->mrc_data + sizeof(train), 0,
-				output_len - sizeof(train));
-
-		mrcdata->mrc_checksum = compute_ip_checksum(mrcdata->mrc_data,
-						mrcdata->mrc_data_size);
-	}
+	store_current_mrc_cache(&train, sizeof(train));
 }
 
 #if REAL