diff --git a/BoardConfig.mk b/BoardConfig.mk
index fbf60e28..b502a35b 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -79,7 +79,7 @@ TARGET_COPY_OUT_VENDOR := vendor
 # Install odex files into the other system image
 BOARD_USES_SYSTEM_OTHER_ODEX := true
 
-BOARD_ROOT_EXTRA_FOLDERS := persist firmware metadata
+BOARD_ROOT_EXTRA_FOLDERS := persist firmware
 
 BOARD_SEPOLICY_DIRS += device/google/wahoo/sepolicy/vendor
 BOARD_PLAT_PUBLIC_SEPOLICY_DIR := device/google/wahoo/sepolicy/public
diff --git a/sepolicy/vendor/file_contexts b/sepolicy/vendor/file_contexts
index c8141e48..1649712a 100644
--- a/sepolicy/vendor/file_contexts
+++ b/sepolicy/vendor/file_contexts
@@ -285,8 +285,5 @@
 /persist/time(/.*)?       u:object_r:persist_time_file:s0
 /persist/battery(/.*)?    u:object_r:persist_battery_file:s0
 
-/metadata                 u:object_r:rootfs:s0
-/metadata/.*              u:object_r:vold_data_file:s0
-
 # b/70518189 vDSO experiments
 /sys/module/vdso/parameters  u:object_r:sysfs_vdso:s0