[ros-diffs] [ion] 22759: - Fix the hack in the previous commit which broke FS support.