[ros-diffs] [cfinck] 44316: Revert 43921 on demand of Aleksey