On my side, the proposed fix doesn't trigger any regression (./gradlew hibernate-core:test)