[ros-diffs] [hbirr] 16582: Revert my last commit (r16578).