[ros-diffs] 02/02: [CDFS] Revert 9d0596a