It is a regression introduced here though. I would prefer this hunk to be removed.