Oups, yep, you're right. Not sure why I got the impression this is for all requirements, my bad.

Would be glad if it can be removed but I would merge those changes anyway.