I have figured out a hacky solution to this. I'll tidy it up and post an RFC patch to gerrit tomorrow. It's bedtime for me now and I'm tired of debugging over a horribly laggy connection :-)