Use correct client object in recent versions of android again