This didn't have enough Signed-off-by lines. ;)

I've adapted it according to my earlier comments. It's currently
untested. Only pushed to publish my follow-up RFC 14fbba3.

View Change

To view, visit change 23021. To unsubscribe, or for help writing mail filters, visit settings.