diff --git a/arch/x86/cpu/cpu.c b/arch/x86/cpu/cpu.c
index 91fec79..f847be0 100644
--- a/arch/x86/cpu/cpu.c
+++ b/arch/x86/cpu/cpu.c
@@ -107,6 +107,8 @@
 	     "movl %%eax, %%cr0\n" \
 	     : : "i" (em_rst), "i" (mp_ne_set) : "eax");
 
+	disable_interrupts();
+
 	return 0;
 }
 int cpu_init_f(void) __attribute__((weak, alias("x86_cpu_init_f")));
diff --git a/cros/vboot/utility.c b/cros/vboot/utility.c
index 5bd03bb..a622d34 100644
--- a/cros/vboot/utility.c
+++ b/cros/vboot/utility.c
@@ -89,22 +89,7 @@
 
 void VbExSleepMs(uint32_t msec)
 {
-	uint32_t delay, start;
-
-	/*
-	 * Can't use entire UINT32_MAX range in the max delay, because it
-	 * pushes get_timer() too close to wraparound. So use /2.
-	 */
-	while(msec > MAX_MSEC_PER_LOOP) {
-		VbExSleepMs(MAX_MSEC_PER_LOOP);
-		msec -= MAX_MSEC_PER_LOOP;
-	}
-
-	delay = msec * TICKS_PER_MSEC;
-	start = get_timer(0);
-
-	while (get_timer(start) < delay)
-		udelay(100);
+	udelay(1000 * msec);
 }
 
 VbError_t VbExBeep(uint32_t msec, uint32_t frequency)