[ros-diffs] [gvg] 20507: Revert accidental commit 20505