GDA-5782 - Revert 4ebd76509086bb4cf7112685df5dbecab2b5d505