diff --git a/BoardConfig.mk b/BoardConfig.mk
index 0ae04ec..2edace4 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -97,7 +97,9 @@
 
 HAVE_ADRENO_SOURCE:= false
 
-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
 
 # Enable dex-preoptimization to speed up first boot sequence
 ifeq ($(HOST_OS),linux)