Hi Paul,
I had the same problem so I wrote a little script to help on the matter. It works on 2.2.2, but haven't test id anywhere else.
It's an admin client script, so you have to copy it inside your admin/cli folder and the running it from the command line as suggested in the script itself.
Please let me know if it works for you.
Cheers,
Jorge