Revert commits breaking the choice of token format

A deprecated option doesn't mean a non-working option...