[ros-diffs] [greatlrd] 17911: revert my change from r17909. Thx hbirr to fix the bug with 17910.