Consider avatar server of server list (reverting change specific for the beta release).