1 files changed, 3 insertions, 7 deletions
diff --git a/lib/puppet/server/master.rb b/lib/puppet/server/master.rb
index f3f0411e9..00d62eb5b 100644
--- a/lib/puppet/server/master.rb
+++ b/lib/puppet/server/master.rb
@@ -7,17 +7,13 @@ require 'xmlrpc/server'
 module Puppet
 class Server
     class MasterError < Puppet::Error; end
-    class Master
+    class Master < Handler
         attr_accessor :ast, :local
         attr_reader :ca
 
-        def self.interface
-            XMLRPC::Service::Interface.new("puppetmaster") { |iface|
+        @interface = XMLRPC::Service::Interface.new("puppetmaster") { |iface|
                 iface.add_method("string getconfig(string)")
-            }
-        end
-
-        Puppet::Server.addhandler(:Master, self)
+        }
 
         def initialize(hash = {})