diff --git a/src/apps/debugger/controllers/DebugReportGenerator.cpp b/src/apps/debugger/controllers/DebugReportGenerator.cpp
index 5c175c17c5..983d2d3f5a 100644
--- a/src/apps/debugger/controllers/DebugReportGenerator.cpp
+++ b/src/apps/debugger/controllers/DebugReportGenerator.cpp
@@ -336,9 +336,9 @@ DebugReportGenerator::_DumpDebuggedThreadInfo(BString& _output,
 		for (int32 i = 0; i < container->CountChildren(); i++) {
 			ValueNodeChild* child = container->ChildAt(i);
 			containerLocker.Unlock();
-			_ResolveValueIfNeeded(child->Node(), frame, 1);
+			_ResolveValueIfNeeded(child->Node(), frame, 2);
 			containerLocker.Lock();
-			UiUtils::PrintValueNodeGraph(_output, child, 3, 1);
+			UiUtils::PrintValueNodeGraph(_output, child, 3, 2);
 		}
 		_output << "\n";
 	}
@@ -380,10 +380,6 @@ DebugReportGenerator::_ResolveValueIfNeeded(ValueNode* node, StackFrame* frame,
 		for (int32 i = 0; i < node->CountChildren(); i++) {
 			ValueNodeChild* child = node->ChildAt(i);
 			containerLocker.Unlock();
-			result = _ResolveLocationIfNeeded(child, frame);
-			if (result != B_OK)
-				continue;
-
 			result = fNodeManager->AddChildNodes(child);
 			if (result != B_OK)
 				continue;
@@ -402,18 +398,3 @@ DebugReportGenerator::_ResolveValueIfNeeded(ValueNode* node, StackFrame* frame,
 
 	return result;
 }
-
-
-status_t
-DebugReportGenerator::_ResolveLocationIfNeeded(ValueNodeChild* child,
-	StackFrame* frame)
-{
-	ValueLocation* location = NULL;
-	ValueLoader loader(fTeam->GetArchitecture(), fTeam->GetTeamMemory(),
-		fTeam->GetTeamTypeInformation(), frame->GetCpuState());
-	status_t result = child->ResolveLocation(&loader, location);
-	child->SetLocation(location, result);
-	if (location != NULL)
-		location->ReleaseReference();
-	return result;
-}
diff --git a/src/apps/debugger/controllers/DebugReportGenerator.h b/src/apps/debugger/controllers/DebugReportGenerator.h
index 677334cfd5..01ae75ece0 100644
--- a/src/apps/debugger/controllers/DebugReportGenerator.h
+++ b/src/apps/debugger/controllers/DebugReportGenerator.h
@@ -52,8 +52,6 @@ private:
 			status_t			_DumpDebuggedThreadInfo(BString& output,
 									::Thread* thread);
 
-			status_t			_ResolveLocationIfNeeded(ValueNodeChild* child,
-									StackFrame* frame);
 			status_t			_ResolveValueIfNeeded(ValueNode* node,
 									StackFrame* frame, int32 maxDepth);
 
diff --git a/src/apps/debugger/user_interface/cli/CliPrintVariableCommand.cpp b/src/apps/debugger/user_interface/cli/CliPrintVariableCommand.cpp
index 335dba6f76..2bb2eb1328 100644
--- a/src/apps/debugger/user_interface/cli/CliPrintVariableCommand.cpp
+++ b/src/apps/debugger/user_interface/cli/CliPrintVariableCommand.cpp
@@ -133,10 +133,6 @@ CliPrintVariableCommand::_ResolveValueIfNeeded(ValueNode* node,
 		for (int32 i = 0; i < node->CountChildren(); i++) {
 			ValueNodeChild* child = node->ChildAt(i);
 			containerLocker.Unlock();
-			result = _ResolveLocationIfNeeded(child, frame, context.GetTeam());
-			if (result != B_OK)
-				continue;
-
 			result = manager->AddChildNodes(child);
 			if (result != B_OK)
 				continue;
@@ -155,18 +151,3 @@ CliPrintVariableCommand::_ResolveValueIfNeeded(ValueNode* node,
 
 	return result;
 }
-
-
-status_t
-CliPrintVariableCommand::_ResolveLocationIfNeeded(ValueNodeChild* child,
-	StackFrame* frame, ::Team* team)
-{
-	ValueLocation* location = NULL;
-	ValueLoader loader(team->GetArchitecture(), team->GetTeamMemory(),
-		team->GetTeamTypeInformation(), frame->GetCpuState());
-	status_t result = child->ResolveLocation(&loader, location);
-	child->SetLocation(location, result);
-	if (location != NULL)
-		location->ReleaseReference();
-	return result;
-}
diff --git a/src/apps/debugger/user_interface/cli/CliPrintVariableCommand.h b/src/apps/debugger/user_interface/cli/CliPrintVariableCommand.h
index aae38adcfc..fe75363e87 100644
--- a/src/apps/debugger/user_interface/cli/CliPrintVariableCommand.h
+++ b/src/apps/debugger/user_interface/cli/CliPrintVariableCommand.h
@@ -24,9 +24,6 @@ public:
 private:
 			status_t			_ResolveValueIfNeeded(ValueNode* node,
 									CliContext& context, int32 maxDepth);
-
-			status_t			_ResolveLocationIfNeeded(ValueNodeChild* child,
-									StackFrame* frame, ::Team* team);
 };