Revert "[10.x] Drop the primary key if it exists when adding a new primary key"

Revert "[10.x] Drop the primary key if it exists when adding a new primary key" #34549