[ros-diffs] [fireball] 22403: Revert r22396: I will provide a better fix