Comment 5 for bug 109143

Putting this back to inprogress because the patch was knocked back in review.

I guess doing it at the ssh layer, though not ideal, is a step forward. If the patch is technically OK I'd be ok to merge it and open a separate bug asking for it to be done in the rpcs rather than when starting the server.