diff --git a/Makefile b/Makefile
index 73be13b9d..08446fa3f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,3 @@
-SHELL := /bin/bash --login
 # You can set these variables from the command line.
 UGLIFYJS		?= node_modules/.bin/uglifyjs
 BABEL			?= node_modules/.bin/babel
diff --git a/src/converse-chatview.js b/src/converse-chatview.js
index 06f3bc378..8bf75d3f7 100644
--- a/src/converse-chatview.js
+++ b/src/converse-chatview.js
@@ -97,7 +97,7 @@
                 { __ } = _converse;
 
             _converse.api.settings.update({
-                'use_emojione': true,
+                'use_emojione': false,
                 'emojione_image_path': emojione.imagePathPNG,
                 'chatview_avatar_height': 32,
                 'chatview_avatar_width': 32,