RavenDB-2865 (partial - without the studio UI) fix