Fixed. Also changed the signatures in PrincipalsUtil to be consistent with this.