diff --git a/initramfs/init.rc b/initramfs/init.rc
--- a/initramfs/init.rc
+++ b/initramfs/init.rc
@@ -96,8 +96,6 @@
 
     insmod /lib/modules/fsr.ko
     insmod /lib/modules/fsr_stl.ko
-    insmod /lib/modules/rfs_glue.ko
-    insmod /lib/modules/rfs_fat.ko
     insmod /lib/modules/dpram.ko
     insmod /lib/modules/j4fs.ko
 
@@ -118,7 +116,7 @@
 
 on fs
 # mount mtd partitions
-    mount rfs /dev/block/stl9 /system check=no
+    mount ext4 /dev/block/mmcblk0p2 /system noatime
 
 # use movinand second partition as /data. d.moskvitin
     #temp
@@ -128,7 +126,7 @@
     mkdir /data
     chown system system /data
     chmod 0771 /data    
-    mount rfs /dev/block/stl10 /data nosuid nodev check=no
+    mount ext4 /dev/block/mmcblk0p3 /data nosuid nodev noatime
     chown system system /data
     chmod 0771 /data
     chmod 0771 /data
@@ -141,7 +139,7 @@
     mkdir /data/db-journal
     chown system system /data/db-journal
     chmod 0777 /data/db-journal
-    mount rfs /dev/block/stl11 /cache nosuid nodev check=no
+    mount ext4 /dev/block/mmcblk0p4 /cache nosuid nodev noatime
 
     mkdir /mnt/.lfs 0755 root root
     mount j4fs /dev/block/stl6 /mnt/.lfs
diff --git a/initramfs/lpm.rc b/initramfs/lpm.rc
--- a/initramfs/lpm.rc
+++ b/initramfs/lpm.rc
@@ -26,8 +26,6 @@
     # rfs drivers
     insmod /lib/modules/fsr.ko
     insmod /lib/modules/fsr_stl.ko
-    insmod /lib/modules/rfs_glue.ko
-    insmod /lib/modules/rfs_fat.ko
 
     # parameter block
     mkdir /mnt/.lfs 0755 root root
@@ -37,7 +35,7 @@
 
 on fs
     mount tmpfs tmpfs /tmp
-    mount rfs /dev/block/stl9 /system check=no
+    mount ext4 /dev/block/mmcblk0p2 /system noatime
 
 on boot
 
diff --git a/initramfs/recovery.rc b/initramfs/recovery.rc
--- a/initramfs/recovery.rc
+++ b/initramfs/recovery.rc
@@ -35,8 +35,6 @@
     # rfs drivers
     insmod /lib/modules/fsr.ko
     insmod /lib/modules/fsr_stl.ko
-    insmod /lib/modules/rfs_glue.ko
-    insmod /lib/modules/rfs_fat.ko
 
     # parameter block
     mkdir /mnt/.lfs 0755 root root
@@ -51,7 +49,7 @@
     chmod 750 /sbin/fat.format
 
 on fs
-    #mount rfs /dev/block/stl9 /system check=no
+    mount ext4 /dev/block/mmcblk0p2 /system noatime
 
 on post-fs
 
diff --git a/initramfs/sbin/mount.wrapper b/initramfs/sbin/mount.wrapper
deleted file mode 100755
--- a/initramfs/sbin/mount.wrapper
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/sbin/sh
-if [ "$2" = 'auto' ] || [ "$2" = 'rfs' ]; then
-	/sbin/busybox mount -t ext4 -o noatime,barrier=0,data=ordered $4 $5 || /sbin/busybox mount $*
-else
-	/sbin/busybox mount $*
-fi
diff --git a/initramfs/sbin/recovery.fstab b/initramfs/sbin/recovery.fstab
--- a/initramfs/sbin/recovery.fstab
+++ b/initramfs/sbin/recovery.fstab
@@ -1,8 +1,8 @@
 # mount point	fstype		device
 
 /sdcard		vfat		/dev/block/mmcblk0p1
-/system		ext4		/dev/block/stl9
-/cache		ext4		/dev/block/stl11
-/data		ext4		/dev/block/stl10
+/system		ext4		/dev/block/mmcblk0p2
+/cache		ext4		/dev/block/mmcblk0p4
+/data		ext4		/dev/block/mmcblk0p3
 /boot		bml		boot
 /recovery	bml		recovery
diff --git a/initramfs/sbin/start_recovery b/initramfs/sbin/start_recovery
--- a/initramfs/sbin/start_recovery
+++ b/initramfs/sbin/start_recovery
@@ -87,6 +87,7 @@
 ln -s recovery /sbin/mkyaffs2image
 ln -s busybox /sbin/modprobe
 ln -s busybox /sbin/more
+ln -s busybox /sbin/mount
 ln -s busybox /sbin/mountpoint
 ln -s busybox /sbin/mv
 ln -s recovery /sbin/nandroid
@@ -157,9 +158,6 @@
 ln -s busybox /sbin/yes
 ln -s busybox /sbin/zcat
 
-mv mount.wrapper mount
-chmod 755 mount
-
 # run the actual recovery
 /sbin/recovery &