Revert "Merge in Fancy Kernel fstab tweaks."

This reverts commit cd6cdfd9e54cc81669b4ba7841906f0f01534c8d.