Return to the old token definition for a bit