diff --git a/scripts/base/init-bare.bro b/scripts/base/init-bare.bro
index 859a69f2dc..8d1d2a312f 100644
--- a/scripts/base/init-bare.bro
+++ b/scripts/base/init-bare.bro
@@ -1508,3 +1508,5 @@ const parse_udp_tunnels = F &redef;
 # Load the logging framework here because it uses fairly deep integration with 
 # BiFs and script-land defined types.
 @load base/frameworks/logging
+
+@load base/input.bif
diff --git a/src/NetVar.h b/src/NetVar.h
index f8def230c0..957a86aeb3 100644
--- a/src/NetVar.h
+++ b/src/NetVar.h
@@ -264,6 +264,7 @@ extern void init_net_var();
 #include "types.bif.netvar_h"
 #include "event.bif.netvar_h"
 #include "logging.bif.netvar_h"
+#include "input.bif.netvar_h"
 #include "reporter.bif.netvar_h"
 
 #endif
diff --git a/src/input.bif b/src/input.bif
index edb6b4e9bb..3ff5284c63 100644
--- a/src/input.bif
+++ b/src/input.bif
@@ -9,7 +9,6 @@ module Input;
 
 function Input::__create_reader%(reader: Input::Reader, source: string%) : bool
 	%{
-	exit(5);
 	InputReader *the_reader = input_mgr->CreateReader(reader->AsEnumVal(), source->AsString()->CheckString());
 	return new Val( the_reader != 0, TYPE_BOOL );
 	%}