[ros-diffs] [dgorbachev] 45228: Trying r45222 hack again...