Merge "Remove puncture_fs."