diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index cb886521..15d428a1 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -1073,9 +1073,6 @@
true
-
- true
-
true
diff --git a/rootdir/etc/fstab.qcom b/rootdir/etc/fstab.qcom
index ffb0b2b3..9fee419c 100644
--- a/rootdir/etc/fstab.qcom
+++ b/rootdir/etc/fstab.qcom
@@ -11,7 +11,7 @@
# Non-A/B fstab.qcom variant
#
-/dev/block/zram0 none swap defaults zramsize=50%,zram_backingdev_size=512M
+/dev/block/zram0 none swap defaults zramsize=50%
/dev/block/bootdevice/by-name/userdata /data ext4 nodev,noatime,nosuid,barrier=1,noauto_da_alloc,discard,lazytime wait,check,fileencryption=ice,reservedsize=128M
/dev/block/bootdevice/by-name/userdata /data f2fs nodev,noatime,nosuid,nodiratime,fsync_mode=nobarrier,background_gc=off wait,check,fileencryption=ice,reservedsize=128M
/dev/block/bootdevice/by-name/misc /misc emmc defaults defaults
diff --git a/rootdir/etc/fstab_A.qcom b/rootdir/etc/fstab_A.qcom
index 6bfae023..c5a41375 100644
--- a/rootdir/etc/fstab_A.qcom
+++ b/rootdir/etc/fstab_A.qcom
@@ -10,7 +10,7 @@
# Non-A/B fstab.qcom variant
#
-/dev/block/zram0 none swap defaults zramsize=50%,zram_backingdev_size=512M
+/dev/block/zram0 none swap defaults zramsize=50%
/dev/block/bootdevice/by-name/system / ext4 ro,barrier=1,discard wait,avb
/dev/block/bootdevice/by-name/userdata /data ext4 nosuid,nodev,barrier=1,discard,noauto_da_alloc,noatime,lazytime wait,check,formattable,fileencryption=ice,reservedsize=128M
/dev/block/bootdevice/by-name/userdata /data f2fs nosuid,nodev,nodiratime,fsync_mode=nobarrier,background_gc=off wait,check,formattable,fileencryption=ice,reservedsize=128M
diff --git a/rootdir/etc/fstab_AB.qcom b/rootdir/etc/fstab_AB.qcom
index b8841d1f..20239e7b 100644
--- a/rootdir/etc/fstab_AB.qcom
+++ b/rootdir/etc/fstab_AB.qcom
@@ -7,7 +7,7 @@
# A/B fstab.qcom variant
#
-/dev/block/zram0 none swap defaults zramsize=50%,zram_backingdev_size=512M
+/dev/block/zram0 none swap defaults zramsize=50%
/dev/block/bootdevice/by-name/system / ext4 ro,barrier=1,discard wait,slotselect
/dev/block/bootdevice/by-name/userdata /data ext4 nodev,noatime,nosuid,barrier=1,noauto_da_alloc,discard,lazytime wait,check,encryptable=footer,formattable,length=-16384
/dev/block/bootdevice/by-name/userdata /data f2fs nodev,noatime,nosuid,inline_xattr,reserve_root=32768,resgid=1065,background_gc=on wait,check,encryptable=footer,formattable,length=-16384