[ros-diffs] [ea] 17285: Cleanup.