Merge "Remove an obsolete comment"