Jeremy Whiting & Steve Ebersole, can you double check the following? I took Jeremy's PR and dynamically inject the dependencies into the descriptor.

https://github.com/hibernate/hibernate-orm/pull/669