Add DISTINCT back to server list query.

Keep it until I figure out how to safely get rid of it.