Comment 9 for bug 1491926

Re-opening this bug so that we can eliminate any misbehaviors of the above patch during upgrades (existing tokens with the legacy encoding still need to be validate correctly).