diff --git a/servers/puppet/modules/humbug/files/sshd_config b/servers/puppet/modules/humbug/files/sshd_config
index 8124da8d83..9e13f45180 100644
--- a/servers/puppet/modules/humbug/files/sshd_config
+++ b/servers/puppet/modules/humbug/files/sshd_config
@@ -69,8 +69,9 @@ TCPKeepAlive yes
 #MaxStartups 10:30:60
 #Banner /etc/issue.net
 
-# Allow client to pass locale environment variables
-AcceptEnv LANG LC_*
+# Commented out to prevent use of client locales. This causes problems
+# otherwise if our developers have a non-standard locale.
+#AcceptEnv LANG LC_*
 
 Subsystem sftp /usr/lib/openssh/sftp-server