[DO NOT MERGE] Rework token fallback