diff --git a/BoardConfig.mk b/BoardConfig.mk
index 0494b5b..1954b69 100755
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -170,8 +170,7 @@ BOARD_ROOT_EXTRA_SYMLINKS := \
     /vendor/dsp:/dsp \
     /vendor/firmware-modem:/firmware-modem \
     /vendor/firmware_mnt:/firmware \
-    /vendor/bt_firmware:/bt_firmware \
-    /mnt/vendor/persist:/persist
+    /vendor/bt_firmware:/bt_firmware
 TARGET_USES_MKE2FS := true
 
 # Root
diff --git a/rootdir/etc/fstab.qcom b/rootdir/etc/fstab.qcom
index 05220ef..93dd3be 100644
--- a/rootdir/etc/fstab.qcom
+++ b/rootdir/etc/fstab.qcom
@@ -12,7 +12,6 @@
 /dev/block/bootdevice/by-name/apnhlos               /vendor/firmware_mnt    vfat    ro,shortname=lower,uid=1000,gid=1000,dmask=227,fmask=337,context=u:object_r:firmware_file:s0       wait
 /dev/block/bootdevice/by-name/modem                 /vendor/firmware-modem  vfat    ro,shortname=lower,uid=1000,gid=1000,dmask=227,fmask=337,context=u:object_r:firmware_file:s0       wait
 /dev/block/bootdevice/by-name/bluetooth             /vendor/bt_firmware     vfat    ro,shortname=lower,uid=1002,gid=3002,dmask=227,fmask=337,context=u:object_r:bt_firmware_file:s0    wait
-/dev/block/bootdevice/by-name/persist               /mnt/vendor/persist     ext4    noatime,nosuid,nodev,noauto_da_alloc,discard,journal_checksum,data=ordered,errors=panic    wait
 
 /dev/block/bootdevice/by-name/misc                  /misc                   emmc    defaults                                                                       defaults
 /dev/block/bootdevice/by-name/hidden                /preload                emmc    defaults                                                                       defaults
diff --git a/rootdir/etc/init.target.rc b/rootdir/etc/init.target.rc
index a642eba..e0d2792 100644
--- a/rootdir/etc/init.target.rc
+++ b/rootdir/etc/init.target.rc
@@ -32,6 +32,7 @@ import /vendor/etc/init/hw/init.${ro.product.vendor.device}.rc
 import /vendor/etc/init/hw/init.${ro.product.vendor.name}.rc
 
 on early-init
+    mkdir /mnt/vendor/persist 0771 system system
     symlink /data/tombstones /tombstones
 
 on fs
@@ -47,6 +48,9 @@ on fs
     chmod 0771 /efs
     restorecon -R /efs
 
+    wait /dev/block/bootdevice/by-name/persist
+    mount ext4 /dev/block/bootdevice/by-name/persist /mnt/vendor/persist nosuid nodev noatime noauto_da_alloc,discard,journal_checksum,data=ordered,errors=panic
+    restorecon_recursive /mnt/vendor/persist
     mkdir /mnt/vendor/persist/data 0700 system system
     mkdir /mnt/vendor/persist/rfs 0700 system system