GEOT-4475 - better solution based on analyzing visitor type and choosing when to delegate, backport of #195