The _setSecurityToken helper created to use security token always set the security token on messages. This forces us to set and clear the token repeatedly to avoid setting it on commands that shouldn't include a tenant.