Merge "Revert "HACK: Run e2fsck with -f"" into nyc-dev