[Reviewer: Andy] Allow setting a non-vendor-specific accounting ID

Why remove the old one?