diff --git a/federationapi/routing/keys.go b/federationapi/routing/keys.go
index aa7324f23..3d8ff2dea 100644
--- a/federationapi/routing/keys.go
+++ b/federationapi/routing/keys.go
@@ -17,7 +17,6 @@ package routing
 import (
 	"encoding/json"
 	"net/http"
-	"strings"
 	"time"
 
 	clienthttputil "github.com/matrix-org/dendrite/clientapi/httputil"
@@ -203,13 +202,7 @@ func NotaryKeys(
 	fsAPI federationAPI.FederationInternalAPI,
 	req *gomatrixserverlib.PublicKeyNotaryLookupRequest,
 ) util.JSONResponse {
-	// strip any additional :PORT from httpReq.Host
-	s := httpReq.Host
-	if i := strings.Index(s, ":"); i > 0 {
-		s = httpReq.Host[:i]
-	}
-
-	serverName := spec.ServerName(s)
+	serverName := spec.ServerName(httpReq.Host) // TODO: this is not ideal
 	if !cfg.Matrix.IsLocalServerName(serverName) {
 		return util.JSONResponse{
 			Code: http.StatusNotFound,
@@ -231,7 +224,6 @@ func NotaryKeys(
 
 	for serverName, kidToCriteria := range req.ServerKeys {
 		var keyList []gomatrixserverlib.ServerKeys
-		// Returns _all_ of our keys, incl. old keys, no matter what was requested.
 		if serverName == cfg.Matrix.ServerName {
 			if k, err := localKeys(cfg, serverName); err == nil {
 				keyList = append(keyList, *k)