OldOffice: Revert to using core's salt copy, so a found "middle"
value does not get lost in set_salt(). See #736.