See this discussion on the list: http://lists.jboss.org/pipermail/hibernate-dev/2018-June/017806.html .
Looks like it won't be an easy fix. Moving to next.