[ros-diffs] [akhaldi] 59575: * Revert r59570 as it caused some integrity issues.