The solution found for https://hibernate.atlassian.net/browse/HHH-13322 creates troubles to existing application, so it has been reverted.

The problem targeted by the original Jira remains open.