If we move to a grpc version past this commit, possibly this problem will go away.