[ros-diffs] [pschweitzer] 56099: [HALX86] Revert r56080 Fix the fix of r56090