Revert "Revert "Remove some potentially objectionable server names""

This reverts commit bbc0635a7372060713630db82a7407bc8dcba3fa.