[ros-diffs] [cfinck] 57748: Revert 57718