[ros-diffs] [tkreuzer] 58763: [RTL/MKHIVE] Revert r58762 and apply a better fix.