diff --git a/src/mainboard/tyan/s2735/auto.c b/src/mainboard/tyan/s2735/auto.c
index 0b037142f7..091e74f321 100644
--- a/src/mainboard/tyan/s2735/auto.c
+++ b/src/mainboard/tyan/s2735/auto.c
@@ -14,8 +14,10 @@
 #include "ram/ramtest.c"
 #include "southbridge/intel/i82801er/i82801er_early_smbus.c"
 #include "northbridge/intel/e7501/raminit.h"
+#if 0
 #include "cpu/intel/model_f2x/apic_timer.c"
 #include "lib/delay.c"
+#endif
 #include "cpu/x86/lapic/boot_cpu.c"
 #include "northbridge/intel/e7501/debug.c"
 #include "superio/winbond/w83627hf/w83627hf_early_serial.c"
diff --git a/src/northbridge/intel/e7501/raminit.c b/src/northbridge/intel/e7501/raminit.c
index 09743ba5fd..ef231666e3 100644
--- a/src/northbridge/intel/e7501/raminit.c
+++ b/src/northbridge/intel/e7501/raminit.c
@@ -492,8 +492,11 @@ static void write_8dwords(uint32_t src_addr, uint32_t dst_addr) {
 	}
 }
 
-//#define SLOW_DOWN_IO inb(0x80);
+#if 1
+#define SLOW_DOWN_IO inb(0x80);
+#else
 #define SLOW_DOWN_IO udelay(40);
+#endif
 
 static void ram_set_rcomp_regs(const struct mem_controller *ctrl) {
 	uint32_t dword;
@@ -1978,10 +1981,17 @@ static void mem_err {
 	/* Estimate that SLOW_DOWN_IO takes about 50&76us*/
 	/* delay for 200us */
 
+#if 1
+static void do_delay(void)
+{
+	int i;
+	for(i = 0; i < 16; i++) { SLOW_DOWN_IO }
+}
+#define DO_DELAY do_delay();
+#else
 #define DO_DELAY \
 	udelay(200);
-//	for(i=0; i<16;i++)  { 	SLOW_DOWN_IO	}
-		
+#endif		
 
 #define EXTRA_DELAY DO_DELAY