[ros-diffs] [weiden] 28122: Revert r28121 as it removes an optimization