[ros-diffs] [jimtabor] 30918: Replace fix for FF. Thanks Chistoph!