ServerName removal. Again.