diff --git a/include/grpc++/impl/codegen/rpc_method.h b/include/grpc++/impl/codegen/rpc_method.h
index b55d75507514c8ae3b34237cc7a87539a07dfa47..48974280747563450fb234dd2c863555fdf1dfb6 100644
--- a/include/grpc++/impl/codegen/rpc_method.h
+++ b/include/grpc++/impl/codegen/rpc_method.h
@@ -46,8 +46,7 @@ class RpcMethod {
     NORMAL_RPC = 0,
     CLIENT_STREAMING,  // request streaming
     SERVER_STREAMING,  // response streaming
-    BIDI_STREAMING,
-    FC_UNARY  // flow-controlled unary call
+    BIDI_STREAMING
   };
 
   RpcMethod(const char* name, RpcType type)
diff --git a/include/grpc++/impl/codegen/service_type.h b/include/grpc++/impl/codegen/service_type.h
index dcfc6b01b7b915866e0dde72cae992c5a21257c5..4af40422a1b6e11343d12aae806fe15d675e338c 100644
--- a/include/grpc++/impl/codegen/service_type.h
+++ b/include/grpc++/impl/codegen/service_type.h
@@ -150,8 +150,11 @@ class Service {
   void MarkMethodFCUnary(int index, MethodHandler* fc_unary_method) {
     GPR_CODEGEN_ASSERT(methods_[index] && methods_[index]->handler() &&
                        "Cannot mark an async or generic method as FCUnary");
-    methods_[index]->SetMethodType(::grpc::RpcMethod::FC_UNARY);
     methods_[index]->SetHandler(fc_unary_method);
+
+    // From the server's point of view, streamed unary is a special
+    // case of BIDI_STREAMING that has 1 read and 1 write, in that order.
+    methods_[index]->SetMethodType(::grpc::RpcMethod::BIDI_STREAMING);
   }
 
  private:
diff --git a/src/compiler/cpp_generator.cc b/src/compiler/cpp_generator.cc
index 252a92d971e28a9680cb7d9e6d9bad767cf5e7d1..c5d4c2573d900cba531e399934bcc4cf5382f53f 100644
--- a/src/compiler/cpp_generator.cc
+++ b/src/compiler/cpp_generator.cc
@@ -1154,7 +1154,7 @@ void PrintSourceService(Printer *printer, const Service *service,
     (*vars)["Idx"] = as_string(i);
     if (method->NoStreaming()) {
       (*vars)["StreamingType"] = "NORMAL_RPC";
-      // NOTE: There is no reason to consider FC_UNARY as a separate
+      // NOTE: There is no reason to consider streamed-unary as a separate
       // category here since this part is setting up the client-side stub
       // and this appears as a NORMAL_RPC from the client-side.
     } else if (method->ClientOnlyStreaming()) {
diff --git a/src/cpp/server/server.cc b/src/cpp/server/server.cc
index c1fbaa09f5c00a6bc69171df2e5c15e6741f1ea0..af04fd4ca6477e3efde054ec80c77a4e770bc5c0 100644
--- a/src/cpp/server/server.cc
+++ b/src/cpp/server/server.cc
@@ -342,7 +342,6 @@ static grpc_server_register_method_payload_handling PayloadHandlingForMethod(
       return GRPC_SRM_PAYLOAD_READ_INITIAL_BYTE_BUFFER;
     case RpcMethod::CLIENT_STREAMING:
     case RpcMethod::BIDI_STREAMING:
-    case RpcMethod::FC_UNARY:
       return GRPC_SRM_PAYLOAD_NONE;
   }
   GPR_UNREACHABLE_CODE(return GRPC_SRM_PAYLOAD_NONE;);