Ok, makes sense. We should also backport fd45f876, btw.

I'll submit a PR in a minute.