From 66896e8bf7169a7d7830a68fe82d49ce1b7bc164 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 15 Nov 2018 08:19:29 -0800
Subject: [PATCH] (stable) Pull some debugging code back out of "master"

See D19778. This is a workaround for T13179 that landed by mistake.
---
 src/applications/almanac/util/AlmanacKeys.php                 | 2 +-
 .../drydock/interface/command/DrydockSSHCommandInterface.php  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/applications/almanac/util/AlmanacKeys.php b/src/applications/almanac/util/AlmanacKeys.php
index 83a4f4021b..7ed9098e97 100644
--- a/src/applications/almanac/util/AlmanacKeys.php
+++ b/src/applications/almanac/util/AlmanacKeys.php
@@ -63,7 +63,7 @@ final class AlmanacKeys extends Phobject {
     // protocol does not have a mechanism like a "Host" header.
     $username = PhabricatorEnv::getEnvConfig('cluster.instance');
     if (strlen($username)) {
-//      return $username;
+      return $username;
     }
 
     $username = PhabricatorEnv::getEnvConfig('diffusion.ssh-user');
diff --git a/src/applications/drydock/interface/command/DrydockSSHCommandInterface.php b/src/applications/drydock/interface/command/DrydockSSHCommandInterface.php
index 7ebd95938b..1aab14b57b 100644
--- a/src/applications/drydock/interface/command/DrydockSSHCommandInterface.php
+++ b/src/applications/drydock/interface/command/DrydockSSHCommandInterface.php
@@ -30,8 +30,8 @@ final class DrydockSSHCommandInterface extends DrydockCommandInterface {
     $full_command = call_user_func_array('csprintf', $argv);
 
     $flags = array();
-    // $flags[] = '-o';
-    // $flags[] = 'LogLevel=quiet';
+    $flags[] = '-o';
+    $flags[] = 'LogLevel=quiet';
 
     $flags[] = '-o';
     $flags[] = 'StrictHostKeyChecking=no';