r2984 - sync comments again