Index: Core/Common/src/Core.Common.Controls.TreeView/TreeViewControl.cs
===================================================================
diff -u -r94d02f6327c40b7753d81862c6131becbe58bc4a -r40afad2717b927cdf8e892a33a7a624ecb223174
--- Core/Common/src/Core.Common.Controls.TreeView/TreeViewControl.cs	(.../TreeViewControl.cs)	(revision 94d02f6327c40b7753d81862c6131becbe58bc4a)
+++ Core/Common/src/Core.Common.Controls.TreeView/TreeViewControl.cs	(.../TreeViewControl.cs)	(revision 40afad2717b927cdf8e892a33a7a624ecb223174)
@@ -161,7 +161,7 @@
                     return;
                 }
 
-                AddRootNodes();
+                AddRootNode(data);
 
                 treeView.SelectedNode = treeView.Nodes.Count > 0 ? treeView.Nodes[0] : null;
             }
@@ -518,21 +518,6 @@
                              .FirstOrDefault(node => node != null);
         }
 
-        private void AddRootNodes()
-        {
-            if (data is IEnumerable<object> rootObjects)
-            {
-                foreach (object rootObject in rootObjects)
-                {
-                    AddRootNode(rootObject);
-                }
-            }
-            else
-            {
-                AddRootNode(data);
-            }
-        }
-
         private void AddRootNode(object rootObject)
         {
             var rootNode = new TreeNode
Index: Core/Common/test/Core.Common.Controls.TreeView.Test/TreeViewControlTest.cs
===================================================================
diff -u -r94d02f6327c40b7753d81862c6131becbe58bc4a -r40afad2717b927cdf8e892a33a7a624ecb223174
--- Core/Common/test/Core.Common.Controls.TreeView.Test/TreeViewControlTest.cs	(.../TreeViewControlTest.cs)	(revision 94d02f6327c40b7753d81862c6131becbe58bc4a)
+++ Core/Common/test/Core.Common.Controls.TreeView.Test/TreeViewControlTest.cs	(.../TreeViewControlTest.cs)	(revision 40afad2717b927cdf8e892a33a7a624ecb223174)
@@ -189,7 +189,7 @@
         }
 
         [Test]
-        public void Data_NodeInfoSetAndDataIsSingleObject_RootNodeAddedAccordingly()
+        public void Data_NodeInfoSet_RootNodeAddedAccordingly()
         {
             // Setup
             using (var treeViewControl = new TreeViewControl())
@@ -212,35 +212,6 @@
         }
 
         [Test]
-        public void Data_NodeInfoSetAndDataIsEnumerationOfObjects_RootNodesAddedAccordingly()
-        {
-            // Setup
-            using (var treeViewControl = new TreeViewControl())
-            {
-                treeViewControl.RegisterTreeNodeInfo(new TreeNodeInfo
-                {
-                    TagType = typeof(object)
-                });
-
-                var testNodeData1 = new object();
-                var testNodeData2 = new object();
-
-                // Call
-                treeViewControl.Data = new[]
-                {
-                    testNodeData1,
-                    testNodeData2
-                };
-
-                // Assert
-                TreeNodeCollection nodes = ((System.Windows.Forms.TreeView) treeViewControl.Controls[0]).Nodes;
-                Assert.AreEqual(2, nodes.Count);
-                Assert.AreSame(testNodeData1, nodes[0].Tag);
-                Assert.AreSame(testNodeData2, nodes[1].Tag);
-            }
-        }
-
-        [Test]
         public void CanRenameNodeForData_Null_ReturnsFalse()
         {
             // Setup