[ros-diffs] [jimtabor] 32578: Fix Magnus change. Part II.