There’s another bug preventing the removal of workarounds: https://hibernate.atlassian.net/browse/HHH-16209