diff --git a/init.d/net/server.el b/init.d/net/server.el
index 5f052a2..8775562 100644
--- a/init.d/net/server.el
+++ b/init.d/net/server.el
@@ -24,8 +24,10 @@
            (tramp-connection-timeout 20)
            (tramp-auto-save-directory
             (concat user-emacs-directory "backups/") "Auto-save locally."))
-  :config (add-to-list
-           'tramp-remote-path 'tramp-own-remote-path)) ; Respect remote PATH.
+  :config (progn
+            (add-to-list
+             'tramp-remote-path 'tramp-own-remote-path) ; Respect remote PATH.
+            (setq tramp-use-ssh-controlmaster-options nil))) ; TEST: :custom didn't get applied.
 
 ;; Run server on TCP socket if:
 ;; - Our EUID is not 0,