This issue was reopened as I reverted the patch (kept the test cases though with @FailureExpected) as part of https://hibernate.atlassian.net/browse/HHH-13192.