diff --git a/src/VisualStudio/Core/Def/InheritanceMargin/InheritanceMarginViewMargin.cs b/src/VisualStudio/Core/Def/InheritanceMargin/InheritanceMarginViewMargin.cs
index df0a964c6d462..36478b38f4e16 100644
--- a/src/VisualStudio/Core/Def/InheritanceMargin/InheritanceMarginViewMargin.cs
+++ b/src/VisualStudio/Core/Def/InheritanceMargin/InheritanceMarginViewMargin.cs
@@ -32,7 +32,6 @@ internal class InheritanceMarginViewMargin : ForegroundThreadAffinitizedObject,
         private readonly IGlobalOptionService _globalOptions;
         private readonly InheritanceGlyphManager _glyphManager;
         private readonly string _languageName;
-        private readonly Grid _grid;
         private readonly Canvas _mainCanvas;
 
         /// <summary>
@@ -61,8 +60,6 @@ public InheritanceMarginViewMargin(
             _globalOptions = globalOptions;
             _languageName = languageName;
             _mainCanvas = new Canvas { ClipToBounds = true, Width = HeightAndWidthOfMargin };
-            _grid = new Grid();
-            _grid.Children.Add(_mainCanvas);
             _glyphManager = new InheritanceGlyphManager(
                 workspace,
                 textView,
@@ -83,10 +80,6 @@ public InheritanceMarginViewMargin(
             _textView.ZoomLevelChanged += OnZoomLevelChanged;
             _globalOptions.OptionChanged += OnGlobalOptionChanged;
 
-            _grid.LayoutTransform = new ScaleTransform(
-                scaleX: _textView.ZoomLevel / 100,
-                scaleY: _textView.ZoomLevel / 100);
-            _grid.LayoutTransform.Freeze();
             UpdateMarginVisibility();
         }
 
@@ -107,7 +100,6 @@ void IDisposable.Dispose()
 
         private void OnZoomLevelChanged(object sender, ZoomLevelChangedEventArgs e)
         {
-            _grid.LayoutTransform = e.ZoomTransform;
             _refreshAllGlyphs = true;
         }
 
@@ -212,7 +204,7 @@ FrameworkElement IWpfTextViewMargin.VisualElement
             get
             {
                 ThrowIfDisposed();
-                return _grid;
+                return _mainCanvas;
             }
         }
 
@@ -221,7 +213,7 @@ double ITextViewMargin.MarginSize
             get
             {
                 ThrowIfDisposed();
-                return _grid.ActualWidth;
+                return _mainCanvas.ActualWidth;
             }
         }
 
diff --git a/src/VisualStudio/IntegrationTest/New.IntegrationTests/InProcess/InheritanceMarginInProcess.cs b/src/VisualStudio/IntegrationTest/New.IntegrationTests/InProcess/InheritanceMarginInProcess.cs
index 16d4386b06828..3f782c182f52c 100644
--- a/src/VisualStudio/IntegrationTest/New.IntegrationTests/InProcess/InheritanceMarginInProcess.cs
+++ b/src/VisualStudio/IntegrationTest/New.IntegrationTests/InProcess/InheritanceMarginInProcess.cs
@@ -68,7 +68,7 @@ public async Task DisableOptionsAsync(string languageName, CancellationToken can
         private async Task EnsureGlyphsAppearAsync(Func<CancellationToken, Task> makeChangeFunc, int expectedGlyphsNumberInMargin, CancellationToken cancellationToken)
         {
             var margin = await GetTextViewMarginAsync(cancellationToken);
-            var marginCanvas = (Canvas)((Grid)margin.VisualElement).Children[0];
+            var marginCanvas = (Canvas)margin.VisualElement;
             var taskCompletionSource = new TaskCompletionSource<bool>();
             using var _ = cancellationToken.Register(() => taskCompletionSource.TrySetCanceled());
 
@@ -116,11 +116,7 @@ public async Task<InheritanceMarginGlyph> GetTheGlyphOnLineAsync(int lineNumber,
             var wpfTextViewLine = activeView.TextViewLines[lineNumber - 1];
             var midOfTheLine = wpfTextViewLine.TextTop + wpfTextViewLine.Height / 2;
             var margin = await GetTextViewMarginAsync(cancellationToken);
-
-            var grid = (Grid)margin.VisualElement;
-            // There will be only one Canvas element.
-            Assert.True(grid.Children.Count == 1);
-            var containingCanvas = (Canvas)((Grid)margin.VisualElement).Children[0];
+            var containingCanvas = (Canvas)margin.VisualElement;
 
             var glyphsOnLine = new List<InheritanceMarginGlyph>();
             foreach (var glyph in containingCanvas.Children)