partially rever some changes: we already have the secret token