Merge obsolete comment removal from 3.2.