[ros-diffs] [gvg] 15689: Revert last change, it was causing build problems. Go back to causing run