[ros-diffs] [sginsberg] 41817: - Revert 41788, replaced by a real fix in 41815. See issue #4663 for more details.