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

This reverts commit 85a7dee63db6d8cd153c4dd78a3310a0aa38f9a9.