WL-3444 : Removed dependency on portal impl