Patch Set 2:

Yes, you're right, that occurred to me in hindsight but I forgot to mention it in my last comment. This is unfortunate but I guess there isn't much we can do about it. At least, not for the immediate future anyway it seems.