[FIX] Tokens: Fix getting tokens with the new scheme

Change-Id: I5b79d02edaf19724ec9c8857f33c57683edb9da6