Revert "Update TokenController scope logic"

This reverts commit f71ce8039388b4112d43129cbe9e29c64032508e.