[ros-diffs] [dchapyshev] 53521: - Partly revert r53519. Fix build