When https://github.com/spring-projects/spring-data-relational/issues/2153 is fixed we can revert c21293bb2475017470ab3603bf506ecf8be3906e