diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index 7c209415..ef735b56 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -408,6 +408,3 @@ BOARD_KERNEL_CMDLINE += at24.write_timeout=100
 
 # Enable larger logbuf
 BOARD_KERNEL_CMDLINE += log_buf_len=1024K
-
-# Temporarily ignore the vendor selinux context namespace problem for PRODUCT_SHIPPING_API_LEVEL 31
-BUILD_BROKEN_VENDOR_PROPERTY_NAMESPACE := true
diff --git a/device.mk b/device.mk
index 24c4f687..c4aa0ead 100644
--- a/device.mk
+++ b/device.mk
@@ -170,7 +170,7 @@ DEVICE_MATRIX_FILE := \
 DEVICE_PACKAGE_OVERLAYS += device/google/gs101/overlay
 
 # This will be updated to 31 (Android S) for shipping
-PRODUCT_SHIPPING_API_LEVEL := 31
+PRODUCT_SHIPPING_API_LEVEL := 30
 
 # Temporarily disable the debugfs restriction on 31 (Android S)
 PRODUCT_SET_DEBUGFS_RESTRICTIONS := false