diff --git a/consul/server.go b/consul/server.go
index 02821513a0..90e19be9f8 100644
--- a/consul/server.go
+++ b/consul/server.go
@@ -224,8 +224,8 @@ func (s *Server) setupRaft() error {
 // setupRPC is used to setup the RPC listener
 func (s *Server) setupRPC() error {
 	// Register the handlers
-	s.rpcServer.Register(&Status{server: s})
-	s.rpcServer.Register(&Raft{server: s})
+	s.rpcServer.Register(&Status{s})
+	s.rpcServer.Register(&Raft{s})
 	s.rpcServer.Register(&Catalog{s})
 	s.rpcServer.Register(&Health{s})