Revert "un-unify fstab"

This reverts commit 1859ca07777b69d2dc77b2367fd2525963f54e29.