diff --git a/7.0/BlazorSample_Server/Shared/data-binding/NestedChild.razor b/7.0/BlazorSample_Server/Shared/data-binding/NestedChild.razor
index 489aa56b3..7ed64535c 100644
--- a/7.0/BlazorSample_Server/Shared/data-binding/NestedChild.razor
+++ b/7.0/BlazorSample_Server/Shared/data-binding/NestedChild.razor
@@ -7,7 +7,8 @@
         <button @onclick="ChangeValue">Change from Child</button>
     </p>
 
-    <NestedGrandchild @bind-GrandchildMessage="BoundValue" />
+    <NestedGrandchild @bind-GrandchildMessage:get="ChildMessage" 
+        @bind-GrandchildMessage:set="ChildMessageChanged" />
 </div>
 
 @code {
@@ -17,12 +18,6 @@
     [Parameter]
     public EventCallback<string> ChildMessageChanged { get; set; }
 
-    private string BoundValue
-    {
-        get => ChildMessage ?? string.Empty;
-        set => ChildMessageChanged.InvokeAsync(value);
-    }
-
     private async Task ChangeValue()
     {
         await ChildMessageChanged.InvokeAsync(
diff --git a/7.0/BlazorSample_WebAssembly/Shared/data-binding/NestedChild.razor b/7.0/BlazorSample_WebAssembly/Shared/data-binding/NestedChild.razor
index 489aa56b3..7ed64535c 100644
--- a/7.0/BlazorSample_WebAssembly/Shared/data-binding/NestedChild.razor
+++ b/7.0/BlazorSample_WebAssembly/Shared/data-binding/NestedChild.razor
@@ -7,7 +7,8 @@
         <button @onclick="ChangeValue">Change from Child</button>
     </p>
 
-    <NestedGrandchild @bind-GrandchildMessage="BoundValue" />
+    <NestedGrandchild @bind-GrandchildMessage:get="ChildMessage" 
+        @bind-GrandchildMessage:set="ChildMessageChanged" />
 </div>
 
 @code {
@@ -17,12 +18,6 @@
     [Parameter]
     public EventCallback<string> ChildMessageChanged { get; set; }
 
-    private string BoundValue
-    {
-        get => ChildMessage ?? string.Empty;
-        set => ChildMessageChanged.InvokeAsync(value);
-    }
-
     private async Task ChangeValue()
     {
         await ChildMessageChanged.InvokeAsync(