Revert "Handle case where server doesn't have public name"

This reverts commit 5f6f5df1cc2a39e2c6ff2205d28c49cd3085b454.