I attempted #3: https://github.com/hibernate/hibernate-orm/pull/472/files Feedback needed!

This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira