How to prevent change of changeset description when linking additional work items?

Team,

for purposes of mimicking metadata on changesets I need to link additional work items to changesets with existing work item links. This works both manually and using the >scm add workitem ... command, but adding the new work item changes the changeset description:

This is unwanted as it perturbs the users viewing their changeset histories or change details.

My current workaround is to:
- check for existing workitems and find the one that matches the prefix of the changeset description
- remove that work item and store the UUID
- add the new work item
- re-add the previous work item

Any ideas for a simpler solution? Notice that for work item to changeset links currently the supported path is through the SCM CLI as it needs to be done from the domain owning the link type.

Thanks,
Arne