I don't mind what approach we take but I'm not including a non-upstreamable patch, I'm afraid.