diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index 0dba5c23..ed27a23b 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -93,7 +93,7 @@ BOARD_USES_ALIGN_RESTRICTION := false
 BOARD_USES_GRALLOC_ION_SYNC := true
 
 # This should be the same value as USE_SWIFTSHADER in device.mk
-BOARD_USES_SWIFTSHADER := true
+BOARD_USES_SWIFTSHADER := false
 
 # Gralloc4
 ifeq ($(BOARD_USES_EXYNOS_GRALLOC_VERSION),4)
diff --git a/device.mk b/device.mk
index 9b50d10b..d2a953f4 100644
--- a/device.mk
+++ b/device.mk
@@ -133,7 +133,7 @@ endif
 # GRAPHICS - GPU (begin)
 
 # Must match BOARD_USES_SWIFTSHADER in BoardConfig.mk
-USE_SWIFTSHADER := true
+USE_SWIFTSHADER := false
 
 # HWUI
 TARGET_USES_VULKAN = false