I sent a preview PR with a hackish solution and an explanation of the challenge we're facing: https://github.com/hibernate/hibernate-orm/pull/2585