We tried to fix it in: https://hibernate.atlassian.net/browse/HHH-12542 but it was not the right approach.

We reverted everything in https://hibernate.atlassian.net/browse/HHH-12931 .

But at some point, we will need to take care of the issue so creating this new one.