This was addressed by Gavin in https://github.com/gavinking/hibernate-orm/commit/f035031c7e7d569cd03d7fce54c0f3920b175167