Revert "Roles may be personal info"

This reverts commit ef759d43bf82e165691647a18f730a8b34f7560c.
Roles may be personal info (refactored)