Temporary workaround for the ClientDependency dependency