Have you seen my pull request? I already did that https://github.com/hibernate/hibernate-orm/pull/931