Merge "Remove obsolete owner."