diff --git a/lib/handlebars.js b/lib/handlebars.js
index 81b7cfbd2..6398a0511 100644
--- a/lib/handlebars.js
+++ b/lib/handlebars.js
@@ -6,6 +6,7 @@ import AST from "./handlebars/compiler/ast";
 import { parser as Parser, parse } from "./handlebars/compiler/base";
 import { Compiler, compile, precompile } from "./handlebars/compiler/compiler";
 import JavaScriptCompiler from "./handlebars/compiler/javascript-compiler";
+import Visitor from "./handlebars/compiler/visitor";
 
 var _create = Handlebars.create;
 var create = function() {
@@ -30,6 +31,8 @@ var create = function() {
 Handlebars = create();
 Handlebars.create = create;
 
+Handlebars.Visitor = Visitor;
+
 /*jshint -W040 */
 /* istanbul ignore next */
 var root = typeof global !== 'undefined' ? global : window,
diff --git a/lib/index.js b/lib/index.js
index 790aab73a..8213d14e5 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -5,8 +5,6 @@
 
 var handlebars = require('../dist/cjs/handlebars')["default"];
 
-handlebars.Visitor = require('../dist/cjs/handlebars/compiler/visitor')["default"];
-
 var printer = require('../dist/cjs/handlebars/compiler/printer');
 handlebars.PrintVisitor = printer.PrintVisitor;
 handlebars.print = printer.print;