move to getByToken (at least at some point soon)