Fix error due to cruft from the RoleAccount patch