2.2 <--merge-- 2.1

You're right. This was introduced [here](https://github.com/neo4j/neo4j/commit/b731f10d0c58212f8aaab646863dd98d5862cc40#diff-1495c1b03d99d4543cb8ffc929173590R220). @systay Did you mean to clean this up and forgot or I'm just annoying you? ;-)