Update for changes to the credentials-binding patch