Removed dropping of roles to get around views