diff --git a/demo/client.ts b/demo/client.ts
index f91c535f..2d7c800d 100644
--- a/demo/client.ts
+++ b/demo/client.ts
@@ -143,7 +143,6 @@ function createTerminal(): void {
         pid = processId;
         socketURL += processId;
         socket = new WebSocket(socketURL);
-        socket.binaryType = 'arraybuffer';
         socket.onopen = runRealTerminal;
         socket.onclose = runFakeTerminal;
         socket.onerror = runFakeTerminal;
diff --git a/demo/server.js b/demo/server.js
index 08413941..8270a398 100644
--- a/demo/server.js
+++ b/demo/server.js
@@ -36,8 +36,7 @@ function startServer() {
           cols: cols || 80,
           rows: rows || 24,
           cwd: process.env.PWD,
-          env: process.env,
-          encoding: null
+          env: process.env
         });
 
     console.log('Created terminal with PID: ' + term.pid);
@@ -67,20 +66,20 @@ function startServer() {
     ws.send(logs[term.pid]);
 
     function buffer(socket, timeout) {
-      let buffer = [];
+      let s = '';
       let sender = null;
       return (data) => {
-        buffer.push(data);
+        s += data;
         if (!sender) {
           sender = setTimeout(() => {
-            socket.send(Buffer.concat(buffer));
-            buffer = [];
+            socket.send(s);
+            s = '';
             sender = null;
           }, timeout);
         }
       };
     }
-  const send = buffer(ws, 5);
+    const send = buffer(ws, 5);
 
     term.on('data', function(data) {
       try {
diff --git a/src/addons/attach/attach.ts b/src/addons/attach/attach.ts
index 0f5d2ea1..2c8a5d4d 100644
--- a/src/addons/attach/attach.ts
+++ b/src/addons/attach/attach.ts
@@ -42,11 +42,6 @@ export function attach(term: Terminal, socket: WebSocket, bidirectional: boolean
   addonTerminal.__getMessage = function(ev: MessageEvent): void {
     let str: string;
 
-    if (ev.data instanceof ArrayBuffer) {
-      addonTerminal.writeUtf8(new Uint8Array(ev.data));
-      return;
-    }
-
     if (typeof ev.data === 'object') {
       if (!myTextDecoder) {
         myTextDecoder = new TextDecoder();