[ros-diffs] [cwittich] 22469: reverted the hdd "fix" from "Great Lord of code duplication" and changed it to hpoussin's proposal