Try to re-enable tokens (bug 933772, bug 938314)