diff --git a/src/mainboard/google/veyron_rialto/Kconfig b/src/mainboard/google/veyron_rialto/Kconfig
index 30c54f6a30..1886db93cd 100644
--- a/src/mainboard/google/veyron_rialto/Kconfig
+++ b/src/mainboard/google/veyron_rialto/Kconfig
@@ -63,14 +63,6 @@ config CONSOLE_SERIAL_UART_ADDRESS
 	depends on DRIVERS_UART
 	default 0xFF690000
 
-# FIXME(dhendrix): This is a gross hack intended to get us past
-# display init which currently hangs the machine. It will be removed
-# once we've re-factored the display init code to properly handle
-# various types of displays.
-config SKIP_DISPLAY_INIT_HACK
-	int
-	default 1
-
 config PMIC_BUS
 	int
 	default 0
diff --git a/src/mainboard/google/veyron_rialto/devicetree.cb b/src/mainboard/google/veyron_rialto/devicetree.cb
index 4c2ea8f709..c40bbbbc4e 100644
--- a/src/mainboard/google/veyron_rialto/devicetree.cb
+++ b/src/mainboard/google/veyron_rialto/devicetree.cb
@@ -21,5 +21,6 @@
 chip soc/rockchip/rk3288
 	device cpu_cluster 0 on end
 	register "vop_id" = "1"
+	register "vop_mode" = "VOP_MODE_NONE"
 	register "framebuffer_bits_per_pixel" = "16"
 end
diff --git a/src/mainboard/google/veyron_rialto/mainboard.c b/src/mainboard/google/veyron_rialto/mainboard.c
index 6e3e51baf5..52a27bbcd3 100644
--- a/src/mainboard/google/veyron_rialto/mainboard.c
+++ b/src/mainboard/google/veyron_rialto/mainboard.c
@@ -108,4 +108,5 @@ void lb_board(struct lb_header *header)
 
 void mainboard_power_on_backlight(void)
 {
+	return;
 }