diff --git a/irc/client_lookup_set.go b/irc/client_lookup_set.go
index a68aaf53..ef767b6d 100644
--- a/irc/client_lookup_set.go
+++ b/irc/client_lookup_set.go
@@ -195,15 +195,6 @@ func (clients *ClientManager) SetNick(client *Client, session *Session, newNick
 			dryRun || session == nil {
 			return "", errNicknameInUse, false
 		}
-		// check TLS modes
-		if client.HasMode(modes.TLS) != currentClient.HasMode(modes.TLS) {
-			if useAccountName {
-				// #955: this is fatal because they can't fix it by trying a different nick
-				return "", errInsecureReattach, false
-			} else {
-				return "", errNicknameInUse, false
-			}
-		}
 		reattachSuccessful, numSessions, lastSeen, wasAway, nowAway := currentClient.AddSession(session)
 		if !reattachSuccessful {
 			return "", errNicknameInUse, false
diff --git a/irc/server.go b/irc/server.go
index e1f3805c..6978c87e 100644
--- a/irc/server.go
+++ b/irc/server.go
@@ -359,10 +359,7 @@ func (server *Server) tryRegister(c *Client, session *Session) (exiting bool) {
 	rb := NewResponseBuffer(session)
 	nickError := performNickChange(server, c, c, session, c.preregNick, rb)
 	rb.Send(true)
-	if nickError == errInsecureReattach {
-		c.Quit(c.t("You can't mix secure and insecure connections to this account"), nil)
-		return true
-	} else if nickError != nil {
+	if nickError != nil {
 		c.preregNick = ""
 		return false
 	}
diff --git a/irctest b/irctest
index e5f22e80..321e254d 160000
--- a/irctest
+++ b/irctest
@@ -1 +1 @@
-Subproject commit e5f22e8080d215fa9b24b51752fbb8f5d51fbbc9
+Subproject commit 321e254d15fab53fe6c8e3959312f6c0805c770f