diff --git a/command/generate-root_test.go b/command/generate-root_test.go
index 847400d84..31d956d73 100644
--- a/command/generate-root_test.go
+++ b/command/generate-root_test.go
@@ -82,7 +82,7 @@ func TestGenerateRoot_status(t *testing.T) {
 		t.Fatalf("bad: %d\n\n%s", code, ui.ErrorWriter.String())
 	}
 
-	if !strings.Contains(string(ui.OutputWriter.Bytes()), "Started: true") {
+	if !strings.Contains(ui.OutputWriter.String(), "Started: true") {
 		t.Fatalf("bad: %s", ui.OutputWriter.String())
 	}
 }
diff --git a/command/rekey_test.go b/command/rekey_test.go
index 21e4e24be..7911111c4 100644
--- a/command/rekey_test.go
+++ b/command/rekey_test.go
@@ -182,7 +182,7 @@ func TestRekey_status(t *testing.T) {
 		t.Fatalf("bad: %d\n\n%s", code, ui.ErrorWriter.String())
 	}
 
-	if !strings.Contains(string(ui.OutputWriter.Bytes()), "Started: true") {
+	if !strings.Contains(ui.OutputWriter.String(), "Started: true") {
 		t.Fatalf("bad: %s", ui.OutputWriter.String())
 	}
 }
diff --git a/command/write_test.go b/command/write_test.go
index 786bbc336..5aa3c1e55 100644
--- a/command/write_test.go
+++ b/command/write_test.go
@@ -243,8 +243,8 @@ func TestWrite_Output(t *testing.T) {
 	if code := c.Run(args); code != 0 {
 		t.Fatalf("bad: %d\n\n%s", code, ui.ErrorWriter.String())
 	}
-	if !strings.Contains(string(ui.OutputWriter.Bytes()), "Key") {
-		t.Fatalf("bad: %s", string(ui.OutputWriter.Bytes()))
+	if !strings.Contains(ui.OutputWriter.String(), "Key") {
+		t.Fatalf("bad: %s", ui.OutputWriter.String())
 	}
 }
 
diff --git a/vault/core.go b/vault/core.go
index b178194f0..5029794ac 100644
--- a/vault/core.go
+++ b/vault/core.go
@@ -1418,11 +1418,6 @@ func (c *Core) runStandby(doneCh, stopCh, manualStepDownCh chan struct{}) {
 		default:
 		}
 
-		// Clear forwarding clients
-		c.requestForwardingConnectionLock.Lock()
-		c.clearForwardingClients()
-		c.requestForwardingConnectionLock.Unlock()
-
 		// Create a lock
 		uuid, err := uuid.GenerateUUID()
 		if err != nil {