Reverted breaking change in CypherQueryHandler.