diff --git a/lib/puppet/plugins/configuration.rb b/lib/puppet/plugins/configuration.rb
index 75bf54b93..9c897932e 100644
--- a/lib/puppet/plugins/configuration.rb
+++ b/lib/puppet/plugins/configuration.rb
@@ -1,67 +1,65 @@
 # Configures the Puppet Plugins, by registering extension points
 # and default implementations.
 #
 # See the respective configured services for more information.
 #
 # @api private
 #
 require 'puppet/plugins'
 
 module Puppet::Plugins::Configuration
-    # TODO: This should always be true in Puppet 4.0 (the way it is done here does not allow toggling)
-    return unless ::Puppet[:binder] || ::Puppet[:parser] == 'future'
     require 'puppet/plugins/binding_schemes'
     require 'puppet/plugins/syntax_checkers'
 
     # Extension-points are registered here:
     #
     # - If in a Ruby submodule it is best to create it here
     # - The class does not have to be required; it will be auto required when the binder
     #   needs it.
     # - If the extension is a multibind, it can be registered here; either with a required
     #   class or a class reference in string form.
 
     checkers_name = Puppet::Plugins::SyntaxCheckers::SYNTAX_CHECKERS_KEY
     checkers_type = Puppet::Plugins::SyntaxCheckers::SYNTAX_CHECKERS_TYPE
 
     schemes_name = Puppet::Plugins::BindingSchemes::BINDINGS_SCHEMES_KEY
     schemes_type = Puppet::Plugins::BindingSchemes::BINDINGS_SCHEMES_TYPE
 
     # Register extension points
     # -------------------------
     system_bindings = ::Puppet::Pops::Binder::SystemBindings
     extensions = system_bindings.extensions()
 
     extensions.multibind(checkers_name).name(checkers_name).hash_of(checkers_type)
     extensions.multibind(schemes_name).name(schemes_name).hash_of(schemes_type)
 
     # Register injector boot bindings
     # -------------------------------
     boot_bindings = system_bindings.injector_boot_bindings()
 
     # Register the default bindings scheme handlers
     { 'module'        => 'ModuleScheme', 
       'confdir'       => 'ConfdirScheme',
     }.each do |scheme, class_name|
       boot_bindings \
         .bind.name(scheme) \
         .instance_of(schemes_type) \
         .in_multibind(schemes_name) \
         .to_instance("Puppet::Pops::Binder::SchemeHandler::#{class_name}")
     end
 
     # Default extensions delivered in Puppet Core are included here
     # -------------------------------------------------------------
     # Classes in this name-space are lazily loaded as they may be overridden and/or never used
     # (Lazy loading is done by binding to the name of a class instead of a Class instance).
 
     # Register extensions
     # -------------------
     bindings = system_bindings.default_bindings()
     bindings.bind do
       name('json')
       instance_of(checkers_type)
       in_multibind(checkers_name)
       to_instance('Puppet::SyntaxCheckers::Json')
     end
 end