[ros-diffs] [gedmurphy] 21551: add Thomas' rebar fix back. I need this fix for imagesoft.