[ros-diffs] [dreimer] 35316: Revert part of my last commit. I will investigate in it when I had some sleep