[ros-diffs] [janderwald] 31548: - revert changes which shouldnt be in (yet)