diff --git a/BoardConfig.mk b/BoardConfig.mk
index 0d9a1755..78ca3099 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -65,7 +65,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
 
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
index 6ee97b11..9b9644a9 100644
--- a/sepolicy/file_contexts
+++ b/sepolicy/file_contexts
@@ -270,7 +270,3 @@
 /persist/data(/.*)?       u:object_r:persist_data_file:s0
 /persist/display(/.*)?    u:object_r:persist_display_file:s0
 /persist/sensors(/.*)?    u:object_r:persist_sensors_file:s0
-
-/metadata                 u:object_r:rootfs:s0
-/metadata/.*              u:object_r:vold_data_file:s0
-