Michal Marek wrote:
> So setups that worked before shouldn't be affected. But nevertheless, as
> this is a more involved change, I'm posting it here for review/comments.

Forgot to attach the patch.