Stop including primary contact's name in salutation fields for organizations

When an organization is added and we also include a Primary Contact, the Basic Info partially automatically populates with the primary contact's information. The primary contact is there so we know who the primary contact is, that is not the name of the constituent. Please update this so that those fields don't automatically populate with this information.