diff --git a/src/csharp/Grpc.Core/Internal/AsyncCall.cs b/src/csharp/Grpc.Core/Internal/AsyncCall.cs
index e2a018e871b..f80ac4a2f9d 100644
--- a/src/csharp/Grpc.Core/Internal/AsyncCall.cs
+++ b/src/csharp/Grpc.Core/Internal/AsyncCall.cs
@@ -499,7 +499,6 @@ namespace Grpc.Core.Internal
             var credentials = details.Options.Credentials;
             using (var nativeCredentials = credentials != null ? credentials.ToNativeCredentials() : null)
             {
-                // TODO(jtattermusch): is the "DefaultMask" correct here??
                 var result = details.Channel.Handle.CreateCall(
                              parentCall, ContextPropagationTokenImpl.DefaultMask, cq,
                              details.Method, details.Host, Timespec.FromDateTime(details.Options.Deadline.Value), nativeCredentials);
diff --git a/src/csharp/Grpc.Core/Internal/ContextPropagationTokenImpl.cs b/src/csharp/Grpc.Core/Internal/ContextPropagationTokenImpl.cs
index 1fd994e607c..e2528e84cff 100644
--- a/src/csharp/Grpc.Core/Internal/ContextPropagationTokenImpl.cs
+++ b/src/csharp/Grpc.Core/Internal/ContextPropagationTokenImpl.cs
@@ -39,7 +39,8 @@ namespace Grpc.Core.Internal
 
         /// <summary>
         /// Default propagation mask used by C# - we want to propagate deadline 
-        /// and cancellation token by our own means.
+        /// and cancellation token by our own means, everything else will be propagated
+        /// by C core automatically (according to <c>DefaultCoreMask</c>).
         /// </summary>
         internal const ContextPropagationFlags DefaultMask = DefaultCoreMask
             & ~ContextPropagationFlags.Deadline & ~ContextPropagationFlags.Cancellation;