diff --git a/go/gen/proto/dolt/services/remotesapi_v1alpha1/chunkstore.pb.go b/go/gen/proto/dolt/services/remotesapi_v1alpha1/chunkstore.pb.go
index b040dbdaf25..f8cd77ee328 100644
--- a/go/gen/proto/dolt/services/remotesapi_v1alpha1/chunkstore.pb.go
+++ b/go/gen/proto/dolt/services/remotesapi_v1alpha1/chunkstore.pb.go
@@ -1,14 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: dolt/services/remotesapi/v1alpha1/chunkstore.proto
 
-package remotesapi
+package remotesapi // import "dolt/services/remotesapi_v1alpha1"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
 
 import (
-	fmt "fmt"
-	proto "github.com/golang/protobuf/proto"
 	context "golang.org/x/net/context"
 	grpc "google.golang.org/grpc"
-	math "math"
 )
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -34,17 +35,16 @@ func (m *RepoId) Reset()         { *m = RepoId{} }
 func (m *RepoId) String() string { return proto.CompactTextString(m) }
 func (*RepoId) ProtoMessage()    {}
 func (*RepoId) Descriptor() ([]byte, []int) {
-	return fileDescriptor_702c187af9ca94ec, []int{0}
+	return fileDescriptor_chunkstore_b76e044100a42d20, []int{0}
 }
-
 func (m *RepoId) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RepoId.Unmarshal(m, b)
 }
 func (m *RepoId) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RepoId.Marshal(b, m, deterministic)
 }
-func (m *RepoId) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RepoId.Merge(m, src)
+func (dst *RepoId) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RepoId.Merge(dst, src)
 }
 func (m *RepoId) XXX_Size() int {
 	return xxx_messageInfo_RepoId.Size(m)
@@ -81,17 +81,16 @@ func (m *HasChunksRequest) Reset()         { *m = HasChunksRequest{} }
 func (m *HasChunksRequest) String() string { return proto.CompactTextString(m) }
 func (*HasChunksRequest) ProtoMessage()    {}
 func (*HasChunksRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_702c187af9ca94ec, []int{1}
+	return fileDescriptor_chunkstore_b76e044100a42d20, []int{1}
 }
-
 func (m *HasChunksRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_HasChunksRequest.Unmarshal(m, b)
 }
 func (m *HasChunksRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_HasChunksRequest.Marshal(b, m, deterministic)
 }
-func (m *HasChunksRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_HasChunksRequest.Merge(m, src)
+func (dst *HasChunksRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HasChunksRequest.Merge(dst, src)
 }
 func (m *HasChunksRequest) XXX_Size() int {
 	return xxx_messageInfo_HasChunksRequest.Size(m)
@@ -127,17 +126,16 @@ func (m *HasChunksResponse) Reset()         { *m = HasChunksResponse{} }
 func (m *HasChunksResponse) String() string { return proto.CompactTextString(m) }
 func (*HasChunksResponse) ProtoMessage()    {}
 func (*HasChunksResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_702c187af9ca94ec, []int{2}
+	return fileDescriptor_chunkstore_b76e044100a42d20, []int{2}
 }
-
 func (m *HasChunksResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_HasChunksResponse.Unmarshal(m, b)
 }
 func (m *HasChunksResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_HasChunksResponse.Marshal(b, m, deterministic)
 }
-func (m *HasChunksResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_HasChunksResponse.Merge(m, src)
+func (dst *HasChunksResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HasChunksResponse.Merge(dst, src)
 }
 func (m *HasChunksResponse) XXX_Size() int {
 	return xxx_messageInfo_HasChunksResponse.Size(m)
@@ -167,17 +165,16 @@ func (m *HttpGetChunk) Reset()         { *m = HttpGetChunk{} }
 func (m *HttpGetChunk) String() string { return proto.CompactTextString(m) }
 func (*HttpGetChunk) ProtoMessage()    {}
 func (*HttpGetChunk) Descriptor() ([]byte, []int) {
-	return fileDescriptor_702c187af9ca94ec, []int{3}
+	return fileDescriptor_chunkstore_b76e044100a42d20, []int{3}
 }
-
 func (m *HttpGetChunk) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_HttpGetChunk.Unmarshal(m, b)
 }
 func (m *HttpGetChunk) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_HttpGetChunk.Marshal(b, m, deterministic)
 }
-func (m *HttpGetChunk) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_HttpGetChunk.Merge(m, src)
+func (dst *HttpGetChunk) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HttpGetChunk.Merge(dst, src)
 }
 func (m *HttpGetChunk) XXX_Size() int {
 	return xxx_messageInfo_HttpGetChunk.Size(m)
@@ -215,17 +212,16 @@ func (m *RangeChunk) Reset()         { *m = RangeChunk{} }
 func (m *RangeChunk) String() string { return proto.CompactTextString(m) }
 func (*RangeChunk) ProtoMessage()    {}
 func (*RangeChunk) Descriptor() ([]byte, []int) {
-	return fileDescriptor_702c187af9ca94ec, []int{4}
+	return fileDescriptor_chunkstore_b76e044100a42d20, []int{4}
 }
-
 func (m *RangeChunk) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RangeChunk.Unmarshal(m, b)
 }
 func (m *RangeChunk) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RangeChunk.Marshal(b, m, deterministic)
 }
-func (m *RangeChunk) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RangeChunk.Merge(m, src)
+func (dst *RangeChunk) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RangeChunk.Merge(dst, src)
 }
 func (m *RangeChunk) XXX_Size() int {
 	return xxx_messageInfo_RangeChunk.Size(m)
@@ -269,17 +265,16 @@ func (m *HttpGetRange) Reset()         { *m = HttpGetRange{} }
 func (m *HttpGetRange) String() string { return proto.CompactTextString(m) }
 func (*HttpGetRange) ProtoMessage()    {}
 func (*HttpGetRange) Descriptor() ([]byte, []int) {
-	return fileDescriptor_702c187af9ca94ec, []int{5}
+	return fileDescriptor_chunkstore_b76e044100a42d20, []int{5}
 }
-
 func (m *HttpGetRange) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_HttpGetRange.Unmarshal(m, b)
 }
 func (m *HttpGetRange) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_HttpGetRange.Marshal(b, m, deterministic)
 }
-func (m *HttpGetRange) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_HttpGetRange.Merge(m, src)
+func (dst *HttpGetRange) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HttpGetRange.Merge(dst, src)
 }
 func (m *HttpGetRange) XXX_Size() int {
 	return xxx_messageInfo_HttpGetRange.Size(m)
@@ -318,17 +313,16 @@ func (m *DownloadLoc) Reset()         { *m = DownloadLoc{} }
 func (m *DownloadLoc) String() string { return proto.CompactTextString(m) }
 func (*DownloadLoc) ProtoMessage()    {}
 func (*DownloadLoc) Descriptor() ([]byte, []int) {
-	return fileDescriptor_702c187af9ca94ec, []int{6}
+	return fileDescriptor_chunkstore_b76e044100a42d20, []int{6}
 }
-
 func (m *DownloadLoc) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DownloadLoc.Unmarshal(m, b)
 }
 func (m *DownloadLoc) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DownloadLoc.Marshal(b, m, deterministic)
 }
-func (m *DownloadLoc) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DownloadLoc.Merge(m, src)
+func (dst *DownloadLoc) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DownloadLoc.Merge(dst, src)
 }
 func (m *DownloadLoc) XXX_Size() int {
 	return xxx_messageInfo_DownloadLoc.Size(m)
@@ -461,17 +455,16 @@ func (m *HttpPostChunk) Reset()         { *m = HttpPostChunk{} }
 func (m *HttpPostChunk) String() string { return proto.CompactTextString(m) }
 func (*HttpPostChunk) ProtoMessage()    {}
 func (*HttpPostChunk) Descriptor() ([]byte, []int) {
-	return fileDescriptor_702c187af9ca94ec, []int{7}
+	return fileDescriptor_chunkstore_b76e044100a42d20, []int{7}
 }
-
 func (m *HttpPostChunk) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_HttpPostChunk.Unmarshal(m, b)
 }
 func (m *HttpPostChunk) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_HttpPostChunk.Marshal(b, m, deterministic)
 }
-func (m *HttpPostChunk) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_HttpPostChunk.Merge(m, src)
+func (dst *HttpPostChunk) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HttpPostChunk.Merge(dst, src)
 }
 func (m *HttpPostChunk) XXX_Size() int {
 	return xxx_messageInfo_HttpPostChunk.Size(m)
@@ -503,17 +496,16 @@ func (m *UploadLoc) Reset()         { *m = UploadLoc{} }
 func (m *UploadLoc) String() string { return proto.CompactTextString(m) }
 func (*UploadLoc) ProtoMessage()    {}
 func (*UploadLoc) Descriptor() ([]byte, []int) {
-	return fileDescriptor_702c187af9ca94ec, []int{8}
+	return fileDescriptor_chunkstore_b76e044100a42d20, []int{8}
 }
-
 func (m *UploadLoc) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UploadLoc.Unmarshal(m, b)
 }
 func (m *UploadLoc) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_UploadLoc.Marshal(b, m, deterministic)
 }
-func (m *UploadLoc) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UploadLoc.Merge(m, src)
+func (dst *UploadLoc) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UploadLoc.Merge(dst, src)
 }
 func (m *UploadLoc) XXX_Size() int {
 	return xxx_messageInfo_UploadLoc.Size(m)
@@ -622,17 +614,16 @@ func (m *GetDownloadLocsRequest) Reset()         { *m = GetDownloadLocsRequest{}
 func (m *GetDownloadLocsRequest) String() string { return proto.CompactTextString(m) }
 func (*GetDownloadLocsRequest) ProtoMessage()    {}
 func (*GetDownloadLocsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_702c187af9ca94ec, []int{9}
+	return fileDescriptor_chunkstore_b76e044100a42d20, []int{9}
 }
-
 func (m *GetDownloadLocsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetDownloadLocsRequest.Unmarshal(m, b)
 }
 func (m *GetDownloadLocsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetDownloadLocsRequest.Marshal(b, m, deterministic)
 }
-func (m *GetDownloadLocsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetDownloadLocsRequest.Merge(m, src)
+func (dst *GetDownloadLocsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetDownloadLocsRequest.Merge(dst, src)
 }
 func (m *GetDownloadLocsRequest) XXX_Size() int {
 	return xxx_messageInfo_GetDownloadLocsRequest.Size(m)
@@ -668,17 +659,16 @@ func (m *GetDownloadLocsResponse) Reset()         { *m = GetDownloadLocsResponse
 func (m *GetDownloadLocsResponse) String() string { return proto.CompactTextString(m) }
 func (*GetDownloadLocsResponse) ProtoMessage()    {}
 func (*GetDownloadLocsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_702c187af9ca94ec, []int{10}
+	return fileDescriptor_chunkstore_b76e044100a42d20, []int{10}
 }
-
 func (m *GetDownloadLocsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetDownloadLocsResponse.Unmarshal(m, b)
 }
 func (m *GetDownloadLocsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetDownloadLocsResponse.Marshal(b, m, deterministic)
 }
-func (m *GetDownloadLocsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetDownloadLocsResponse.Merge(m, src)
+func (dst *GetDownloadLocsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetDownloadLocsResponse.Merge(dst, src)
 }
 func (m *GetDownloadLocsResponse) XXX_Size() int {
 	return xxx_messageInfo_GetDownloadLocsResponse.Size(m)
@@ -708,17 +698,16 @@ func (m *GetUploadLocsRequest) Reset()         { *m = GetUploadLocsRequest{} }
 func (m *GetUploadLocsRequest) String() string { return proto.CompactTextString(m) }
 func (*GetUploadLocsRequest) ProtoMessage()    {}
 func (*GetUploadLocsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_702c187af9ca94ec, []int{11}
+	return fileDescriptor_chunkstore_b76e044100a42d20, []int{11}
 }
-
 func (m *GetUploadLocsRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetUploadLocsRequest.Unmarshal(m, b)
 }
 func (m *GetUploadLocsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetUploadLocsRequest.Marshal(b, m, deterministic)
 }
-func (m *GetUploadLocsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetUploadLocsRequest.Merge(m, src)
+func (dst *GetUploadLocsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetUploadLocsRequest.Merge(dst, src)
 }
 func (m *GetUploadLocsRequest) XXX_Size() int {
 	return xxx_messageInfo_GetUploadLocsRequest.Size(m)
@@ -754,17 +743,16 @@ func (m *GetUploadLocsResponse) Reset()         { *m = GetUploadLocsResponse{} }
 func (m *GetUploadLocsResponse) String() string { return proto.CompactTextString(m) }
 func (*GetUploadLocsResponse) ProtoMessage()    {}
 func (*GetUploadLocsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_702c187af9ca94ec, []int{12}
+	return fileDescriptor_chunkstore_b76e044100a42d20, []int{12}
 }
-
 func (m *GetUploadLocsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetUploadLocsResponse.Unmarshal(m, b)
 }
 func (m *GetUploadLocsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_GetUploadLocsResponse.Marshal(b, m, deterministic)
 }
-func (m *GetUploadLocsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetUploadLocsResponse.Merge(m, src)
+func (dst *GetUploadLocsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetUploadLocsResponse.Merge(dst, src)
 }
 func (m *GetUploadLocsResponse) XXX_Size() int {
 	return xxx_messageInfo_GetUploadLocsResponse.Size(m)
@@ -793,17 +781,16 @@ func (m *RebaseRequest) Reset()         { *m = RebaseRequest{} }
 func (m *RebaseRequest) String() string { return proto.CompactTextString(m) }
 func (*RebaseRequest) ProtoMessage()    {}
 func (*RebaseRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_702c187af9ca94ec, []int{13}
+	return fileDescriptor_chunkstore_b76e044100a42d20, []int{13}
 }
-
 func (m *RebaseRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RebaseRequest.Unmarshal(m, b)
 }
 func (m *RebaseRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RebaseRequest.Marshal(b, m, deterministic)
 }
-func (m *RebaseRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RebaseRequest.Merge(m, src)
+func (dst *RebaseRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RebaseRequest.Merge(dst, src)
 }
 func (m *RebaseRequest) XXX_Size() int {
 	return xxx_messageInfo_RebaseRequest.Size(m)
@@ -831,17 +818,16 @@ func (m *RebaseResponse) Reset()         { *m = RebaseResponse{} }
 func (m *RebaseResponse) String() string { return proto.CompactTextString(m) }
 func (*RebaseResponse) ProtoMessage()    {}
 func (*RebaseResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_702c187af9ca94ec, []int{14}
+	return fileDescriptor_chunkstore_b76e044100a42d20, []int{14}
 }
-
 func (m *RebaseResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RebaseResponse.Unmarshal(m, b)
 }
 func (m *RebaseResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RebaseResponse.Marshal(b, m, deterministic)
 }
-func (m *RebaseResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RebaseResponse.Merge(m, src)
+func (dst *RebaseResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RebaseResponse.Merge(dst, src)
 }
 func (m *RebaseResponse) XXX_Size() int {
 	return xxx_messageInfo_RebaseResponse.Size(m)
@@ -863,17 +849,16 @@ func (m *RootRequest) Reset()         { *m = RootRequest{} }
 func (m *RootRequest) String() string { return proto.CompactTextString(m) }
 func (*RootRequest) ProtoMessage()    {}
 func (*RootRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_702c187af9ca94ec, []int{15}
+	return fileDescriptor_chunkstore_b76e044100a42d20, []int{15}
 }
-
 func (m *RootRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RootRequest.Unmarshal(m, b)
 }
 func (m *RootRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RootRequest.Marshal(b, m, deterministic)
 }
-func (m *RootRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RootRequest.Merge(m, src)
+func (dst *RootRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RootRequest.Merge(dst, src)
 }
 func (m *RootRequest) XXX_Size() int {
 	return xxx_messageInfo_RootRequest.Size(m)
@@ -902,17 +887,16 @@ func (m *RootResponse) Reset()         { *m = RootResponse{} }
 func (m *RootResponse) String() string { return proto.CompactTextString(m) }
 func (*RootResponse) ProtoMessage()    {}
 func (*RootResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_702c187af9ca94ec, []int{16}
+	return fileDescriptor_chunkstore_b76e044100a42d20, []int{16}
 }
-
 func (m *RootResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RootResponse.Unmarshal(m, b)
 }
 func (m *RootResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RootResponse.Marshal(b, m, deterministic)
 }
-func (m *RootResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RootResponse.Merge(m, src)
+func (dst *RootResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RootResponse.Merge(dst, src)
 }
 func (m *RootResponse) XXX_Size() int {
 	return xxx_messageInfo_RootResponse.Size(m)
@@ -942,17 +926,16 @@ func (m *ChunkTableInfo) Reset()         { *m = ChunkTableInfo{} }
 func (m *ChunkTableInfo) String() string { return proto.CompactTextString(m) }
 func (*ChunkTableInfo) ProtoMessage()    {}
 func (*ChunkTableInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_702c187af9ca94ec, []int{17}
+	return fileDescriptor_chunkstore_b76e044100a42d20, []int{17}
 }
-
 func (m *ChunkTableInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ChunkTableInfo.Unmarshal(m, b)
 }
 func (m *ChunkTableInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ChunkTableInfo.Marshal(b, m, deterministic)
 }
-func (m *ChunkTableInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ChunkTableInfo.Merge(m, src)
+func (dst *ChunkTableInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ChunkTableInfo.Merge(dst, src)
 }
 func (m *ChunkTableInfo) XXX_Size() int {
 	return xxx_messageInfo_ChunkTableInfo.Size(m)
@@ -991,17 +974,16 @@ func (m *CommitRequest) Reset()         { *m = CommitRequest{} }
 func (m *CommitRequest) String() string { return proto.CompactTextString(m) }
 func (*CommitRequest) ProtoMessage()    {}
 func (*CommitRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_702c187af9ca94ec, []int{18}
+	return fileDescriptor_chunkstore_b76e044100a42d20, []int{18}
 }
-
 func (m *CommitRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CommitRequest.Unmarshal(m, b)
 }
 func (m *CommitRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CommitRequest.Marshal(b, m, deterministic)
 }
-func (m *CommitRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CommitRequest.Merge(m, src)
+func (dst *CommitRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CommitRequest.Merge(dst, src)
 }
 func (m *CommitRequest) XXX_Size() int {
 	return xxx_messageInfo_CommitRequest.Size(m)
@@ -1051,17 +1033,16 @@ func (m *CommitResponse) Reset()         { *m = CommitResponse{} }
 func (m *CommitResponse) String() string { return proto.CompactTextString(m) }
 func (*CommitResponse) ProtoMessage()    {}
 func (*CommitResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_702c187af9ca94ec, []int{19}
+	return fileDescriptor_chunkstore_b76e044100a42d20, []int{19}
 }
-
 func (m *CommitResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CommitResponse.Unmarshal(m, b)
 }
 func (m *CommitResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_CommitResponse.Marshal(b, m, deterministic)
 }
-func (m *CommitResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CommitResponse.Merge(m, src)
+func (dst *CommitResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CommitResponse.Merge(dst, src)
 }
 func (m *CommitResponse) XXX_Size() int {
 	return xxx_messageInfo_CommitResponse.Size(m)
@@ -1102,64 +1083,6 @@ func init() {
 	proto.RegisterType((*CommitResponse)(nil), "dolt.services.remotesapi.v1alpha1.CommitResponse")
 }
 
-func init() {
-	proto.RegisterFile("dolt/services/remotesapi/v1alpha1/chunkstore.proto", fileDescriptor_702c187af9ca94ec)
-}
-
-var fileDescriptor_702c187af9ca94ec = []byte{
-	// 796 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x56, 0xdd, 0x6e, 0xd3, 0x48,
-	0x14, 0xae, 0x9b, 0x34, 0x3f, 0x27, 0x3f, 0x4a, 0x47, 0xbb, 0x5d, 0x2b, 0x7b, 0xb1, 0xa9, 0xaf,
-	0xb2, 0xdb, 0xae, 0xd3, 0xa4, 0x48, 0x2d, 0x70, 0x83, 0x52, 0xaa, 0xa6, 0x52, 0x05, 0x65, 0x0a,
-	0x42, 0x80, 0x50, 0x34, 0x71, 0x26, 0x71, 0x84, 0xe3, 0x31, 0x9e, 0x49, 0xb9, 0xe1, 0x9e, 0x2b,
-	0xde, 0x89, 0x27, 0xe1, 0x09, 0x78, 0x08, 0x34, 0xe3, 0x71, 0xea, 0xb4, 0xa9, 0x70, 0x50, 0xd5,
-	0xbb, 0x9c, 0x13, 0x7f, 0xe7, 0xfb, 0xbe, 0xe3, 0x39, 0x67, 0x0c, 0x9d, 0x21, 0xf3, 0x44, 0x8b,
-	0xd3, 0xf0, 0x72, 0xe2, 0x50, 0xde, 0x0a, 0xe9, 0x94, 0x09, 0xca, 0x49, 0x30, 0x69, 0x5d, 0xb6,
-	0x89, 0x17, 0xb8, 0xa4, 0xdd, 0x72, 0xdc, 0x99, 0xff, 0x81, 0x0b, 0x16, 0x52, 0x3b, 0x08, 0x99,
-	0x60, 0x68, 0x5b, 0x62, 0xec, 0x18, 0x63, 0x5f, 0x61, 0xec, 0x18, 0x63, 0x1d, 0x40, 0x0e, 0xd3,
-	0x80, 0x9d, 0x0e, 0x51, 0x0d, 0x32, 0x2c, 0x1c, 0x9b, 0x46, 0xc3, 0x68, 0x16, 0xb1, 0xfc, 0x89,
-	0xfe, 0x86, 0x62, 0x48, 0x03, 0xd6, 0xf7, 0xc9, 0x94, 0x9a, 0xeb, 0x2a, 0x5f, 0x90, 0x89, 0x67,
-	0x64, 0x4a, 0x2d, 0x1f, 0x6a, 0x3d, 0xc2, 0x8f, 0x14, 0x25, 0xa6, 0x1f, 0x67, 0x94, 0x0b, 0xd4,
-	0x85, 0xbc, 0x02, 0x4c, 0x86, 0xaa, 0x4c, 0xa9, 0xf3, 0xaf, 0xfd, 0x4b, 0x05, 0x76, 0x44, 0x8f,
-	0x73, 0x61, 0x24, 0x63, 0x0b, 0x72, 0x2e, 0xe1, 0x2e, 0xe5, 0xe6, 0x7a, 0x23, 0xd3, 0x2c, 0x63,
-	0x1d, 0x59, 0x3b, 0xb0, 0x99, 0xe0, 0xe3, 0x01, 0xf3, 0x39, 0x95, 0x0f, 0x93, 0x01, 0xa7, 0xbe,
-	0x30, 0x8d, 0x46, 0xa6, 0xb9, 0x81, 0x75, 0x64, 0x1d, 0x42, 0xb9, 0x27, 0x44, 0x70, 0x42, 0x85,
-	0x02, 0x48, 0x6f, 0xb3, 0xd0, 0x8b, 0xbd, 0xcd, 0x42, 0xef, 0x56, 0x9a, 0x73, 0x00, 0x4c, 0xfc,
-	0x31, 0x8d, 0x70, 0x08, 0xb2, 0x32, 0xaf, 0x80, 0x65, 0xac, 0x7e, 0x4b, 0x24, 0x1b, 0x8d, 0x38,
-	0x15, 0xaa, 0x25, 0x59, 0xac, 0x23, 0x99, 0xf7, 0xa8, 0x3f, 0x16, 0xae, 0x99, 0x69, 0x18, 0xcd,
-	0x0a, 0xd6, 0x91, 0x35, 0x9e, 0x6b, 0x51, 0x85, 0x97, 0x68, 0x39, 0x86, 0x5c, 0x28, 0xff, 0x8a,
-	0xb4, 0x94, 0x3a, 0xff, 0xa7, 0xe9, 0xda, 0x5c, 0x24, 0xd6, 0x60, 0xeb, 0x9b, 0x01, 0xa5, 0xa7,
-	0xec, 0x93, 0xef, 0x31, 0x32, 0x3c, 0x63, 0x0e, 0x3a, 0x83, 0x82, 0x2b, 0x44, 0xd0, 0x1f, 0x53,
-	0xa1, 0x5f, 0x47, 0x2b, 0x45, 0xe1, 0x64, 0xdf, 0x7a, 0x6b, 0x38, 0xef, 0x46, 0x31, 0x7a, 0x0d,
-	0xd5, 0xb8, 0x5a, 0x5f, 0x11, 0x2a, 0xfb, 0x2b, 0xd5, 0x54, 0x9a, 0x7b, 0x6b, 0xb8, 0xec, 0x26,
-	0xe2, 0x2e, 0x40, 0xc1, 0x63, 0x0e, 0x11, 0x13, 0xe6, 0x5b, 0xdb, 0x50, 0x91, 0xcf, 0x9e, 0x33,
-	0x7e, 0xdb, 0x8b, 0xb3, 0x3e, 0x43, 0xf1, 0x55, 0x10, 0x5b, 0x5c, 0xf6, 0x7e, 0x9e, 0x43, 0x51,
-	0x09, 0x0d, 0x18, 0x17, 0x5a, 0xe3, 0x5e, 0x4a, 0x8d, 0x73, 0xde, 0xde, 0x1a, 0x56, 0xbd, 0x93,
-	0x89, 0x05, 0x81, 0x02, 0xb6, 0x4e, 0xa8, 0x48, 0x74, 0xf9, 0x5e, 0xce, 0xfe, 0x7b, 0xf8, 0xeb,
-	0x06, 0xab, 0x9e, 0x80, 0x2e, 0x64, 0x3d, 0xe6, 0x70, 0x75, 0xfe, 0x4b, 0x1d, 0x3b, 0x05, 0x67,
-	0xa2, 0x0c, 0x56, 0x58, 0x2b, 0x84, 0x3f, 0x4e, 0xa8, 0x98, 0x77, 0xf5, 0x5e, 0x2c, 0xbd, 0x81,
-	0x3f, 0xaf, 0x71, 0x6a, 0x43, 0x4f, 0x16, 0x0c, 0xed, 0xa6, 0x60, 0x9c, 0x17, 0xd1, 0x76, 0x2e,
-	0xa0, 0x82, 0xe9, 0x80, 0x70, 0x7a, 0x87, 0x3e, 0xac, 0x1a, 0x54, 0xe3, 0xa2, 0x91, 0x50, 0xeb,
-	0x05, 0x94, 0x30, 0x63, 0xe2, 0x2e, 0x49, 0x76, 0xa0, 0x1c, 0x95, 0xd4, 0xbd, 0x90, 0x0b, 0x98,
-	0x31, 0xd1, 0x4f, 0x9c, 0xf1, 0x82, 0x4c, 0xf4, 0x08, 0x77, 0xad, 0x63, 0xa8, 0xaa, 0xb3, 0xfa,
-	0x92, 0x0c, 0x3c, 0x7a, 0xea, 0x8f, 0xd8, 0xd2, 0x69, 0xf8, 0x07, 0x4a, 0xea, 0x5a, 0xe8, 0x3b,
-	0x6c, 0xe6, 0x47, 0xf3, 0x50, 0xc1, 0xa0, 0x52, 0x47, 0x32, 0x63, 0x7d, 0x37, 0xa0, 0x72, 0xc4,
-	0xa6, 0xd3, 0xc9, 0x5d, 0x3a, 0x41, 0x26, 0xe4, 0x9d, 0x59, 0x18, 0x52, 0x4d, 0x59, 0xc6, 0x71,
-	0x28, 0x45, 0x7a, 0x84, 0x0b, 0xb5, 0x24, 0xcb, 0x58, 0xfd, 0x46, 0xef, 0xa0, 0x16, 0x89, 0x14,
-	0xd2, 0x4b, 0x7f, 0xe2, 0x8f, 0x98, 0x99, 0x55, 0xef, 0xbf, 0x9d, 0x82, 0x7a, 0xb1, 0x0b, 0xb8,
-	0xea, 0x2c, 0xc4, 0xd6, 0x7f, 0x50, 0x8d, 0xfd, 0xe9, 0xb6, 0x9a, 0x90, 0xe7, 0x33, 0xc7, 0xa1,
-	0x9c, 0x2b, 0x83, 0x05, 0x1c, 0x87, 0x9d, 0x1f, 0x1b, 0xb0, 0xa9, 0xca, 0x5d, 0xc8, 0x5b, 0xf4,
-	0x22, 0x62, 0x45, 0x97, 0x50, 0x9c, 0x5f, 0x3d, 0x68, 0x3f, 0xcd, 0x2e, 0xb9, 0x76, 0x31, 0xd6,
-	0x1f, 0xac, 0x06, 0xd2, 0x3a, 0xbf, 0x1a, 0x6a, 0x30, 0x13, 0x03, 0xab, 0x96, 0x10, 0x47, 0x0f,
-	0x53, 0x94, 0x5b, 0xbe, 0xa6, 0xea, 0x8f, 0x7e, 0x07, 0xaa, 0xf5, 0x7c, 0x31, 0x00, 0x25, 0x87,
-	0x56, 0xab, 0x39, 0x48, 0x57, 0xf2, 0xc6, 0x7e, 0xa9, 0x1f, 0xae, 0x0e, 0xd4, 0x4a, 0xa6, 0xf2,
-	0xab, 0x45, 0x4e, 0x23, 0xda, 0x4b, 0x75, 0x36, 0x13, 0xdb, 0xa0, 0xde, 0x5e, 0x01, 0xa1, 0xe9,
-	0xc6, 0x90, 0x95, 0x73, 0x89, 0xd2, 0xac, 0xd7, 0xc4, 0x4e, 0xa8, 0xb7, 0x52, 0x3f, 0x7f, 0xe5,
-	0x2b, 0x3a, 0xab, 0xa9, 0x7c, 0x2d, 0x8c, 0x6d, 0x2a, 0x5f, 0x8b, 0x83, 0xd0, 0xb5, 0xdf, 0xee,
-	0xde, 0xf6, 0x55, 0xd9, 0x8f, 0x31, 0x8f, 0xaf, 0x72, 0x83, 0x9c, 0xfa, 0xac, 0xdc, 0xff, 0x19,
-	0x00, 0x00, 0xff, 0xff, 0x97, 0x0a, 0x97, 0x5c, 0x8c, 0x0a, 0x00, 0x00,
-}
-
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -1396,3 +1319,61 @@ var _ChunkStoreService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "dolt/services/remotesapi/v1alpha1/chunkstore.proto",
 }
+
+func init() {
+	proto.RegisterFile("dolt/services/remotesapi/v1alpha1/chunkstore.proto", fileDescriptor_chunkstore_b76e044100a42d20)
+}
+
+var fileDescriptor_chunkstore_b76e044100a42d20 = []byte{
+	// 796 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x56, 0xdd, 0x6e, 0xd3, 0x48,
+	0x14, 0xae, 0x9b, 0x34, 0x3f, 0x27, 0x3f, 0x4a, 0x47, 0xbb, 0x5d, 0x2b, 0x7b, 0xb1, 0xa9, 0xaf,
+	0xb2, 0xdb, 0xae, 0xd3, 0xa4, 0x48, 0x2d, 0x70, 0x83, 0x52, 0xaa, 0xa6, 0x52, 0x05, 0x65, 0x0a,
+	0x42, 0x80, 0x50, 0x34, 0x71, 0x26, 0x71, 0x84, 0xe3, 0x31, 0x9e, 0x49, 0xb9, 0xe1, 0x9e, 0x2b,
+	0xde, 0x89, 0x27, 0xe1, 0x09, 0x78, 0x08, 0x34, 0xe3, 0x71, 0xea, 0xb4, 0xa9, 0x70, 0x50, 0xd5,
+	0xbb, 0x9c, 0x13, 0x7f, 0xe7, 0xfb, 0xbe, 0xe3, 0x39, 0x67, 0x0c, 0x9d, 0x21, 0xf3, 0x44, 0x8b,
+	0xd3, 0xf0, 0x72, 0xe2, 0x50, 0xde, 0x0a, 0xe9, 0x94, 0x09, 0xca, 0x49, 0x30, 0x69, 0x5d, 0xb6,
+	0x89, 0x17, 0xb8, 0xa4, 0xdd, 0x72, 0xdc, 0x99, 0xff, 0x81, 0x0b, 0x16, 0x52, 0x3b, 0x08, 0x99,
+	0x60, 0x68, 0x5b, 0x62, 0xec, 0x18, 0x63, 0x5f, 0x61, 0xec, 0x18, 0x63, 0x1d, 0x40, 0x0e, 0xd3,
+	0x80, 0x9d, 0x0e, 0x51, 0x0d, 0x32, 0x2c, 0x1c, 0x9b, 0x46, 0xc3, 0x68, 0x16, 0xb1, 0xfc, 0x89,
+	0xfe, 0x86, 0x62, 0x48, 0x03, 0xd6, 0xf7, 0xc9, 0x94, 0x9a, 0xeb, 0x2a, 0x5f, 0x90, 0x89, 0x67,
+	0x64, 0x4a, 0x2d, 0x1f, 0x6a, 0x3d, 0xc2, 0x8f, 0x14, 0x25, 0xa6, 0x1f, 0x67, 0x94, 0x0b, 0xd4,
+	0x85, 0xbc, 0x02, 0x4c, 0x86, 0xaa, 0x4c, 0xa9, 0xf3, 0xaf, 0xfd, 0x4b, 0x05, 0x76, 0x44, 0x8f,
+	0x73, 0x61, 0x24, 0x63, 0x0b, 0x72, 0x2e, 0xe1, 0x2e, 0xe5, 0xe6, 0x7a, 0x23, 0xd3, 0x2c, 0x63,
+	0x1d, 0x59, 0x3b, 0xb0, 0x99, 0xe0, 0xe3, 0x01, 0xf3, 0x39, 0x95, 0x0f, 0x93, 0x01, 0xa7, 0xbe,
+	0x30, 0x8d, 0x46, 0xa6, 0xb9, 0x81, 0x75, 0x64, 0x1d, 0x42, 0xb9, 0x27, 0x44, 0x70, 0x42, 0x85,
+	0x02, 0x48, 0x6f, 0xb3, 0xd0, 0x8b, 0xbd, 0xcd, 0x42, 0xef, 0x56, 0x9a, 0x73, 0x00, 0x4c, 0xfc,
+	0x31, 0x8d, 0x70, 0x08, 0xb2, 0x32, 0xaf, 0x80, 0x65, 0xac, 0x7e, 0x4b, 0x24, 0x1b, 0x8d, 0x38,
+	0x15, 0xaa, 0x25, 0x59, 0xac, 0x23, 0x99, 0xf7, 0xa8, 0x3f, 0x16, 0xae, 0x99, 0x69, 0x18, 0xcd,
+	0x0a, 0xd6, 0x91, 0x35, 0x9e, 0x6b, 0x51, 0x85, 0x97, 0x68, 0x39, 0x86, 0x5c, 0x28, 0xff, 0x8a,
+	0xb4, 0x94, 0x3a, 0xff, 0xa7, 0xe9, 0xda, 0x5c, 0x24, 0xd6, 0x60, 0xeb, 0x9b, 0x01, 0xa5, 0xa7,
+	0xec, 0x93, 0xef, 0x31, 0x32, 0x3c, 0x63, 0x0e, 0x3a, 0x83, 0x82, 0x2b, 0x44, 0xd0, 0x1f, 0x53,
+	0xa1, 0x5f, 0x47, 0x2b, 0x45, 0xe1, 0x64, 0xdf, 0x7a, 0x6b, 0x38, 0xef, 0x46, 0x31, 0x7a, 0x0d,
+	0xd5, 0xb8, 0x5a, 0x5f, 0x11, 0x2a, 0xfb, 0x2b, 0xd5, 0x54, 0x9a, 0x7b, 0x6b, 0xb8, 0xec, 0x26,
+	0xe2, 0x2e, 0x40, 0xc1, 0x63, 0x0e, 0x11, 0x13, 0xe6, 0x5b, 0xdb, 0x50, 0x91, 0xcf, 0x9e, 0x33,
+	0x7e, 0xdb, 0x8b, 0xb3, 0x3e, 0x43, 0xf1, 0x55, 0x10, 0x5b, 0x5c, 0xf6, 0x7e, 0x9e, 0x43, 0x51,
+	0x09, 0x0d, 0x18, 0x17, 0x5a, 0xe3, 0x5e, 0x4a, 0x8d, 0x73, 0xde, 0xde, 0x1a, 0x56, 0xbd, 0x93,
+	0x89, 0x05, 0x81, 0x02, 0xb6, 0x4e, 0xa8, 0x48, 0x74, 0xf9, 0x5e, 0xce, 0xfe, 0x7b, 0xf8, 0xeb,
+	0x06, 0xab, 0x9e, 0x80, 0x2e, 0x64, 0x3d, 0xe6, 0x70, 0x75, 0xfe, 0x4b, 0x1d, 0x3b, 0x05, 0x67,
+	0xa2, 0x0c, 0x56, 0x58, 0x2b, 0x84, 0x3f, 0x4e, 0xa8, 0x98, 0x77, 0xf5, 0x5e, 0x2c, 0xbd, 0x81,
+	0x3f, 0xaf, 0x71, 0x6a, 0x43, 0x4f, 0x16, 0x0c, 0xed, 0xa6, 0x60, 0x9c, 0x17, 0xd1, 0x76, 0x2e,
+	0xa0, 0x82, 0xe9, 0x80, 0x70, 0x7a, 0x87, 0x3e, 0xac, 0x1a, 0x54, 0xe3, 0xa2, 0x91, 0x50, 0xeb,
+	0x05, 0x94, 0x30, 0x63, 0xe2, 0x2e, 0x49, 0x76, 0xa0, 0x1c, 0x95, 0xd4, 0xbd, 0x90, 0x0b, 0x98,
+	0x31, 0xd1, 0x4f, 0x9c, 0xf1, 0x82, 0x4c, 0xf4, 0x08, 0x77, 0xad, 0x63, 0xa8, 0xaa, 0xb3, 0xfa,
+	0x92, 0x0c, 0x3c, 0x7a, 0xea, 0x8f, 0xd8, 0xd2, 0x69, 0xf8, 0x07, 0x4a, 0xea, 0x5a, 0xe8, 0x3b,
+	0x6c, 0xe6, 0x47, 0xf3, 0x50, 0xc1, 0xa0, 0x52, 0x47, 0x32, 0x63, 0x7d, 0x37, 0xa0, 0x72, 0xc4,
+	0xa6, 0xd3, 0xc9, 0x5d, 0x3a, 0x41, 0x26, 0xe4, 0x9d, 0x59, 0x18, 0x52, 0x4d, 0x59, 0xc6, 0x71,
+	0x28, 0x45, 0x7a, 0x84, 0x0b, 0xb5, 0x24, 0xcb, 0x58, 0xfd, 0x46, 0xef, 0xa0, 0x16, 0x89, 0x14,
+	0xd2, 0x4b, 0x7f, 0xe2, 0x8f, 0x98, 0x99, 0x55, 0xef, 0xbf, 0x9d, 0x82, 0x7a, 0xb1, 0x0b, 0xb8,
+	0xea, 0x2c, 0xc4, 0xd6, 0x7f, 0x50, 0x8d, 0xfd, 0xe9, 0xb6, 0x9a, 0x90, 0xe7, 0x33, 0xc7, 0xa1,
+	0x9c, 0x2b, 0x83, 0x05, 0x1c, 0x87, 0x9d, 0x1f, 0x1b, 0xb0, 0xa9, 0xca, 0x5d, 0xc8, 0x5b, 0xf4,
+	0x22, 0x62, 0x45, 0x97, 0x50, 0x9c, 0x5f, 0x3d, 0x68, 0x3f, 0xcd, 0x2e, 0xb9, 0x76, 0x31, 0xd6,
+	0x1f, 0xac, 0x06, 0xd2, 0x3a, 0xbf, 0x1a, 0x6a, 0x30, 0x13, 0x03, 0xab, 0x96, 0x10, 0x47, 0x0f,
+	0x53, 0x94, 0x5b, 0xbe, 0xa6, 0xea, 0x8f, 0x7e, 0x07, 0xaa, 0xf5, 0x7c, 0x31, 0x00, 0x25, 0x87,
+	0x56, 0xab, 0x39, 0x48, 0x57, 0xf2, 0xc6, 0x7e, 0xa9, 0x1f, 0xae, 0x0e, 0xd4, 0x4a, 0xa6, 0xf2,
+	0xab, 0x45, 0x4e, 0x23, 0xda, 0x4b, 0x75, 0x36, 0x13, 0xdb, 0xa0, 0xde, 0x5e, 0x01, 0xa1, 0xe9,
+	0xc6, 0x90, 0x95, 0x73, 0x89, 0xd2, 0xac, 0xd7, 0xc4, 0x4e, 0xa8, 0xb7, 0x52, 0x3f, 0x7f, 0xe5,
+	0x2b, 0x3a, 0xab, 0xa9, 0x7c, 0x2d, 0x8c, 0x6d, 0x2a, 0x5f, 0x8b, 0x83, 0xd0, 0xb5, 0xdf, 0xee,
+	0xde, 0xf6, 0x55, 0xd9, 0x8f, 0x31, 0x8f, 0xaf, 0x72, 0x83, 0x9c, 0xfa, 0xac, 0xdc, 0xff, 0x19,
+	0x00, 0x00, 0xff, 0xff, 0x97, 0x0a, 0x97, 0x5c, 0x8c, 0x0a, 0x00, 0x00,
+}
diff --git a/go/gen/proto/dolt/services/remotesapi_v1alpha1/credentials.pb.go b/go/gen/proto/dolt/services/remotesapi_v1alpha1/credentials.pb.go
index 4369df51e3d..3c18bf1079f 100644
--- a/go/gen/proto/dolt/services/remotesapi_v1alpha1/credentials.pb.go
+++ b/go/gen/proto/dolt/services/remotesapi_v1alpha1/credentials.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: dolt/services/remotesapi/v1alpha1/credentials.proto
 
-package remotesapi
+package remotesapi // import "dolt/services/remotesapi_v1alpha1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -33,7 +33,7 @@ func (m *WhoAmIRequest) Reset()         { *m = WhoAmIRequest{} }
 func (m *WhoAmIRequest) String() string { return proto.CompactTextString(m) }
 func (*WhoAmIRequest) ProtoMessage()    {}
 func (*WhoAmIRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_credentials_aa5476cb79973d71, []int{0}
+	return fileDescriptor_credentials_3a5bd67b96ec88e3, []int{0}
 }
 func (m *WhoAmIRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_WhoAmIRequest.Unmarshal(m, b)
@@ -69,7 +69,7 @@ func (m *WhoAmIResponse) Reset()         { *m = WhoAmIResponse{} }
 func (m *WhoAmIResponse) String() string { return proto.CompactTextString(m) }
 func (*WhoAmIResponse) ProtoMessage()    {}
 func (*WhoAmIResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_credentials_aa5476cb79973d71, []int{1}
+	return fileDescriptor_credentials_3a5bd67b96ec88e3, []int{1}
 }
 func (m *WhoAmIResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_WhoAmIResponse.Unmarshal(m, b)
@@ -188,10 +188,10 @@ var _CredentialsService_serviceDesc = grpc.ServiceDesc{
 }
 
 func init() {
-	proto.RegisterFile("dolt/services/remotesapi/v1alpha1/credentials.proto", fileDescriptor_credentials_aa5476cb79973d71)
+	proto.RegisterFile("dolt/services/remotesapi/v1alpha1/credentials.proto", fileDescriptor_credentials_3a5bd67b96ec88e3)
 }
 
-var fileDescriptor_credentials_aa5476cb79973d71 = []byte{
+var fileDescriptor_credentials_3a5bd67b96ec88e3 = []byte{
 	// 237 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x90, 0xb1, 0x4b, 0x43, 0x31,
 	0x10, 0xc6, 0x79, 0x0a, 0x45, 0xcf, 0x56, 0x21, 0x53, 0xe9, 0x64, 0xeb, 0xe2, 0x20, 0x79, 0x3e,
diff --git a/proto/Makefile b/proto/Makefile
index 58220d7ccb5..214b36066bb 100644
--- a/proto/Makefile
+++ b/proto/Makefile
@@ -1,7 +1,9 @@
-GOOGLEAPIS := ${HOME}/src/3p/googleapis
-PROTOBUF := ${HOME}/src/3p/protobuf/src
+THIRD_PARTY_ROOT := ../../proto/third_party
 
-PROTOC = protoc
+GOOGLEAPIS := $(THIRD_PARTY_ROOT)/googleapis
+PROTOBUF := $(THIRD_PARTY_ROOT)/protobuf/src
+
+PROTOC := $(THIRD_PARTY_ROOT)/protobuf/bazel-bin/protoc
 PROTOC_FLAGS = -I . -I $(GOOGLEAPIS) -I $(PROTOBUF)
 
 pbgo_out := ../go/gen/proto
@@ -15,6 +17,11 @@ PBGO_pkgs := REMOTESAPI
 
 all:
 
+$(PROTOC):
+	@echo "ERROR: Could not find $(PROTOC)"
+	@echo "ERROR: Run "'`'"bazel build //:protoc"'`'" in $(THIRD_PARTY_ROOT)/protobuf to build protoc."
+	@exit 1
+
 .PHONY: clean
 
 clean: