Revert "reorganize fstab"

This reverts commit 6cf2ca4f3cd76bfb89b4ac4cd47cd5bac2b0a1fd.