No need to override token check (bug 938314)