Rollback issues from avatar commit