[ros-diffs] [gadamopoulos] 48289: Revert a part of my previous commit