Fixes for master [including removing a regression i introduced when fixing the provider having identity_api on it.
Fixes for master [including removing a regression i introduced when fixing the provider having identity_api on it.