diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 76e00995..7f6634d0 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -234,9 +234,8 @@ TARGET_EXFAT_DRIVER := exfat
 BOARD_ROOT_EXTRA_SYMLINKS := \
     /vendor/dsp:/dsp \
     /vendor/firmware_mnt:/firmware \
-    /vendor/bt_firmware:/bt_firmware
-
-BOARD_ROOT_EXTRA_FOLDERS := persist
+    /vendor/bt_firmware:/bt_firmware \
+    /mnt/vendor/persist:/persist
 
 TARGET_COPY_OUT_VENDOR := vendor
 TARGET_USERIMAGES_USE_EXT4 := true
diff --git a/rootdir/etc/fstab.qcom b/rootdir/etc/fstab.qcom
index 959173a7..564f25d6 100644
--- a/rootdir/etc/fstab.qcom
+++ b/rootdir/etc/fstab.qcom
@@ -22,7 +22,6 @@
 /dev/block/bootdevice/by-name/cache      /cache             ext4   nosuid,nodev,noatime,barrier=1                           wait
 /dev/block/bootdevice/by-name/cache      /cache             f2fs   noatime,nosuid,nodev,nodiratime,discard,fsync_mode=nobarrier,inline_xattr,inline_data,data_flush   wait
 /dev/block/bootdevice/by-name/persist    /mnt/vendor/persist  ext4   nosuid,nodev,barrier=1,noatime  wait,check
-/mnt/vendor/persist                      /persist           none   bind                                                        wait
 
 /dev/block/bootdevice/by-name/system     /system            ext4    ro,barrier=1                                    wait,recoveryonly
 /dev/block/bootdevice/by-name/vendor     /vendor            ext4    ro,barrier=1                                    wait,recoveryonly