diff --git a/product.mk b/product.mk
index e57851b..782a500 100644
--- a/product.mk
+++ b/product.mk
@@ -46,10 +46,6 @@ EXCLUDE_GOOGLE_SERVICES_DEVICES += \
     %molly \
     %tv_molly
 
-ifneq ($(filter $(EXCLUDE_GOOGLE_SERVICES_DEVICES),$(TARGET_PRODUCT)),)
-DISABLE_GAPPS := true
-endif
-
-ifneq ($(DISABLE_GAPPS),true)
+ifeq ($(WITH_GMS),true)
 -include vendor/google_pixel/product.mk
 endif # Disable GApps