fs: Fixed Cherry-pick

facePalm