[ros-diffs] [fireball] 24471: Revert r24430 changes (by Magnus Olsen) since they are incorrect (additionally confirmed by Filip Navara)