Merge "Fix an obsolete comment."