Description
These are the changes:
We introduced them when we worked on #2176 and #2174, but they are causing a regression in Quarkus:
quarkusio/quarkus#47314
I will try to have a look and see if I can figure out what's going on, but, if we cannot find a solution, I think it's better to revert the changes and applies them again later