Revert making UserCredentials a struct