re-doing https://github.com/neo4j/neo4j/commit/48d226980799ee3ef6c6e7b2fa5e1af32e55b20a, works locally

@tinwelint Retrying this commit, it works locally, let's see if PR build likes it too. Can you remember the problems that occurred last time?
https://github.com/neo4j/neo4j/commit/48d226980799ee3ef6c6e7b2fa5e1af32e55b20a