--- src/readline.c.orig	2018-05-25 11:09:38.000000000 -0700
+++ src/readline.c	2018-11-17 08:13:35.000000000 -0700
@@ -2098,9 +2098,8 @@
 void
 rl_callback_handler_remove(void)
 {
+	el_set(e, EL_UNBUFFERED, 0);
 	rl_linefunc = NULL;
-	el_end(e);
-	e = NULL;
 }
 
 void