diff --git a/marlin/BoardConfig.mk b/marlin/BoardConfig.mk
index a702037..9d7a036 100644
--- a/marlin/BoardConfig.mk
+++ b/marlin/BoardConfig.mk
@@ -81,7 +81,9 @@
 USE_OPENGL_RENDERER := true
 BOARD_USE_LEGACY_UI := true
 NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3
-OVERRIDE_RS_DRIVER:= libRSDriver_adreno.so
+# Bug: 36902991
+# Disable the GPU RS driver until we get a working drop.
+# OVERRIDE_RS_DRIVER:= libRSDriver_adreno.so
 
 TARGET_USERIMAGES_USE_EXT4 := true
 BOARD_BOOTIMAGE_PARTITION_SIZE := 0x02000000
diff --git a/sailfish/BoardConfig.mk b/sailfish/BoardConfig.mk
index cd3360d..84bdeba 100644
--- a/sailfish/BoardConfig.mk
+++ b/sailfish/BoardConfig.mk
@@ -76,7 +76,9 @@
 USE_OPENGL_RENDERER := true
 BOARD_USE_LEGACY_UI := true
 NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3
-OVERRIDE_RS_DRIVER:= libRSDriver_adreno.so
+# Bug: 36902991
+# Disable the GPU RS driver until we get a working drop.
+# OVERRIDE_RS_DRIVER:= libRSDriver_adreno.so
 
 TARGET_USERIMAGES_USE_EXT4 := true
 BOARD_BOOTIMAGE_PARTITION_SIZE := 0x02000000