[ros-diffs] [gedmurphy] 22843: revert r22824 as requested by Fireball. The auto sync didn't work as expected.