> BTW, I see this is merged upstream. That's great, but it seems broken.
> Please fix it or revert it out.

Sorry, that was my mistake! I was aware of this discussion. It seems I
accidently applied it. I'll send a revert and we can reapply it once
everyone is happy.