===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.c,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- src/usr.bin/tmux/tmux.c	2015/11/11 23:23:33	1.150
+++ src/usr.bin/tmux/tmux.c	2015/11/12 11:09:11	1.151
@@ -1,4 +1,4 @@
-/* $OpenBSD: tmux.c,v 1.150 2015/11/11 23:23:33 nicm Exp $ */
+/* $OpenBSD: tmux.c,v 1.151 2015/11/12 11:09:11 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -290,12 +290,6 @@
 
 	global_w_options = options_create(NULL);
 	options_table_populate_tree(window_options_table, global_w_options);
-
-	/* Enable UTF-8 if the first client is on UTF-8 terminal. */
-	if (flags & CLIENT_UTF8) {
-		options_set_number(global_s_options, "status-utf8", 1);
-		options_set_number(global_w_options, "utf8", 1);
-	}
 
 	/* Override keys to vi if VISUAL or EDITOR are set. */
 	if ((s = getenv("VISUAL")) != NULL || (s = getenv("EDITOR")) != NULL) {