Revert "Fix Token"

This reverts commit b0e72cbcdd4a8a0e3ddc8350185112899a61e48b.
Fix Token Issue