Return to older version of Android tokens