RavenDB-2585 second attempt