[ros-diffs] [cwittich] 39582: revert r39578 as it breaks rosautotest on 3rd stage