diff --git a/cli_classic.c b/cli_classic.c
index 587ecef..1981ccc 100644
--- a/cli_classic.c
+++ b/cli_classic.c
@@ -271,7 +271,8 @@
 	print_version();
 	print_banner();
 
-	if (selfcheck())
+	/* FIXME: Delay calibration should happen in programmer code. */
+	if (flashrom_init(1))
 		exit(1);
 
 	setbuf(stdout, NULL);
@@ -557,9 +558,6 @@
 		}
 	}
 
-	/* FIXME: Delay calibration should happen in programmer code. */
-	myusec_calibrate_delay();
-
 	if (programmer_init(prog, pparam)) {
 		msg_perr("Error: Programmer initialization failed.\n");
 		ret = 1;