revert fixes
Add ability to skip mount fs