[ros-diffs] [cgutman] 54738: [FASTFAT] - Revert r54731