diff --git a/chip/g/jitter.c b/chip/g/jitter.c
index b0686bc0bf..1dd938cbf3 100644
--- a/chip/g/jitter.c
+++ b/chip/g/jitter.c
@@ -49,8 +49,10 @@ void init_jittery_clock(int highsec)
 	GREG32(XO, CLK_JTR_SYNC_CONTENTS) = 0;
 
 	/* Writing any value locks things until the next hard reboot */
-	GREG32(XO, CFG_WR_EN) = 0;
-	GREG32(XO, JTR_CTRL_EN) = 0;
+	/* crosbug.com/p/54916
+	   GREG32(XO, CFG_WR_EN) = 0;
+	   GREG32(XO, JTR_CTRL_EN) = 0;
+	*/
 }
 
 void init_sof_clock(void)
diff --git a/chip/g/upgrade_fw.c b/chip/g/upgrade_fw.c
index 045a934448..26d3d32517 100644
--- a/chip/g/upgrade_fw.c
+++ b/chip/g/upgrade_fw.c
@@ -128,7 +128,10 @@ void fw_upgrade_command_handler(void *body,
 			return;
 		}
 
-		wipe_nvram(); /* Do not keep any state around. */
+		/*
+		  crosbug.com/p/54916
+		  wipe_nvram(); Do not keep any state around.
+		*/
 
 		/*
 		 * Successful erase means that we need to return the base