Handle old-style unmasked tokens for upgrading (with a warning)