Revert expired token change since it's not quite working.

This reverts commit eea931a70019feceea60f6d0660cbbd9bb2ee89d.