[ros-diffs] [dreimer] 35938: Partial revert of my previous commit. Some things were not that well...