[ros-diffs] [cgutman] 36151: - Revert r36141 and r36102 - They cause a strange mIRC crash