This was solved; adding some links for posterity as we had to make changes across projects:

In Hibernate ORM:

• https://github.com/hibernate/hibernate-orm/compare/4b037cd...90b69ff

And in Quarkus:

• https://github.com/quarkusio/quarkus/pull/7115/commits