diff --git a/etcdserver/api/v3rpc/key.go b/etcdserver/api/v3rpc/key.go
index ff179c8f0..b2af39908 100644
--- a/etcdserver/api/v3rpc/key.go
+++ b/etcdserver/api/v3rpc/key.go
@@ -21,10 +21,10 @@ import (
 )
 
 type handler struct {
-	server etcdserver.Server
+	server etcdserver.V3DemoServer
 }
 
-func New(s etcdserver.Server) pb.EtcdServer {
+func New(s etcdserver.V3DemoServer) pb.EtcdServer {
 	return &handler{s}
 }
 
diff --git a/etcdserver/server.go b/etcdserver/server.go
index 646d56de2..a4752cf49 100644
--- a/etcdserver/server.go
+++ b/etcdserver/server.go
@@ -28,7 +28,6 @@ import (
 
 	"github.com/coreos/etcd/Godeps/_workspace/src/github.com/coreos/go-semver/semver"
 	"github.com/coreos/etcd/Godeps/_workspace/src/github.com/coreos/pkg/capnslog"
-	"github.com/coreos/etcd/Godeps/_workspace/src/github.com/gogo/protobuf/proto"
 	"github.com/coreos/etcd/Godeps/_workspace/src/golang.org/x/net/context"
 	"github.com/coreos/etcd/discovery"
 	"github.com/coreos/etcd/etcdserver/etcdhttp/httptypes"
@@ -109,7 +108,6 @@ type Server interface {
 	Leader() types.ID
 	// Do takes a request and attempts to fulfill it, returning a Response.
 	Do(ctx context.Context, r pb.Request) (Response, error)
-	V3DemoDo(ctx context.Context, r pb.InternalRaftRequest) proto.Message
 	// Process takes a raft message and applies it to the server's raft state
 	// machine, respecting any timeout of the given context.
 	Process(ctx context.Context, m raftpb.Message) error
diff --git a/etcdserver/v3demo_server.go b/etcdserver/v3demo_server.go
index 80272a67a..409a56c17 100644
--- a/etcdserver/v3demo_server.go
+++ b/etcdserver/v3demo_server.go
@@ -20,6 +20,10 @@ import (
 	pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
 )
 
+type V3DemoServer interface {
+	V3DemoDo(ctx context.Context, r pb.InternalRaftRequest) proto.Message
+}
+
 func (s *EtcdServer) V3DemoDo(ctx context.Context, r pb.InternalRaftRequest) proto.Message {
 	switch {
 	case r.Range != nil:
@@ -55,5 +59,4 @@ func (s *EtcdServer) V3DemoDo(ctx context.Context, r pb.InternalRaftRequest) pro
 	default:
 		panic("not implemented")
 	}
-	return nil
 }