[ros-diffs] [cwittich] 40559: revert 40488 as it breaks regsvr32