SOC-4118: Re-added the old method