Fix old none ::APIClient uses.