diff --git a/board/nm/nmhw21/board.c b/board/nm/nmhw21/board.c
index e9151ad9e8..9f7283b521 100644
--- a/board/nm/nmhw21/board.c
+++ b/board/nm/nmhw21/board.c
@@ -786,11 +786,10 @@ static void check_jtag_boot(void)
 	}
 }
 
-#if 0
-
 static void check_fct(void)
 {
-	/* Check whether an I2C device (EEPROM) is present at address 0xA2/0x51
+	/*
+	 * Check whether an I2C device (EEPROM) is present at address 0xA2/0x51
 	 * In this case we are connected to the factory test station.
 	 * Clear the bootcmd, so that test system can easily connect.
 	 */
@@ -802,13 +801,14 @@ static void check_fct(void)
 
 	/* If probe fails we are sure no eeprom is connected */
 	if (i2c_probe(0x51) == 0) {
-		printf("Entering fct mode\n");
 		setenv ("bootcmd", "");
+		puts("Detected factory test system. Waiting on command line\n");
 	}
 
 	i2c_set_bus_num(old_bus);
 }
 
+#if 0
 
 static bool get_button_state(void)
 {
@@ -958,10 +958,7 @@ int board_late_init(void)
 	set_status_led(0, 1);	/* Green */
 	ui_set_top_led(0, 1);
 
-
-	/*
 	check_fct();
-	*/
 	check_jtag_boot();
 #endif