diff --git a/src/mainboard/google/zork/bootblock.c b/src/mainboard/google/zork/bootblock.c
index 11391efd1e..a7636de702 100644
--- a/src/mainboard/google/zork/bootblock.c
+++ b/src/mainboard/google/zork/bootblock.c
@@ -12,4 +12,6 @@ void bootblock_mainboard_early_init(void)
 		gpios = variant_early_gpio_table(&num_gpios);
 		program_gpios(gpios, num_gpios);
 	}
+
+	variant_pcie_gpio_configure();
 }
diff --git a/src/mainboard/google/zork/romstage.c b/src/mainboard/google/zork/romstage.c
deleted file mode 100644
index 39f23cff83..0000000000
--- a/src/mainboard/google/zork/romstage.c
+++ /dev/null
@@ -1,11 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-
-#include <baseboard/variants.h>
-#include <soc/gpio.h>
-#include <soc/romstage.h>
-#include <console/console.h>
-
-void mainboard_romstage_entry_s3(int s3_resume)
-{
-	variant_pcie_gpio_configure();
-}