Re-enable /data mounting. Turns out it works fine using an actual ext4 FS for /data..