diff --git a/stl/debugger/STL.natvis b/stl/debugger/STL.natvis
index eee583f922..e1f3ec5cc2 100644
--- a/stl/debugger/STL.natvis
+++ b/stl/debugger/STL.natvis
@@ -104,12 +104,10 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
   </Type>
 
   <Type Name="std::optional&lt;*&gt;">
-      <Intrinsic Name="has_value" Expression="_Has_value"/>
-      <Intrinsic Name="value" Expression="_Value"/>
-      <DisplayString Condition="!has_value()">nullopt</DisplayString>
-      <DisplayString Condition="has_value()">{value()}</DisplayString>
+      <DisplayString Condition="!_Has_value">nullopt</DisplayString>
+      <DisplayString Condition="_Has_value">{_Value}</DisplayString>
       <Expand>
-          <Item Condition="has_value()" Name="value">value()</Item>
+          <Item Condition="_Has_value" Name="value">_Value</Item>
       </Expand>
   </Type>