diff --git a/lldb/source/Core/ValueObjectVariable.cpp b/lldb/source/Core/ValueObjectVariable.cpp
index bc5dd2612788..58e37bdfc9ef 100644
--- a/lldb/source/Core/ValueObjectVariable.cpp
+++ b/lldb/source/Core/ValueObjectVariable.cpp
@@ -156,11 +156,8 @@ ValueObjectVariable::UpdateValue ()
                     SetAddressTypeOfChildren(eAddressTypeHost);
                     break;
                 case Value::eValueTypeLoadAddress:
-                    SetAddressTypeOfChildren(eAddressTypeLoad);
-                    break;
                 case Value::eValueTypeScalar:
-                    // TODO: is this the right thing to do?
-                    SetAddressTypeOfChildren(eAddressTypeInvalid);
+                    SetAddressTypeOfChildren(eAddressTypeLoad);
                     break;
             }