         }
 
         if (gridDimensions)
-        {
             gridDimensions.columnsCollectionChanged(event);
-        
-            // ToDo(klin): Manipulating columns should not change the rowCount.
-            if (dataProvider)
-                gridDimensions.rowCount = dataProvider.length;
-        }
         
         if (gridLayout)
             gridLayout.columnsCollectionChanged(event);

            
            gridDimensions.clear();
            
            // clearing the gridDimensions resets rowCount
            gridDimensions.rowCount = _dataProvider ? _dataProvider.length : 0;
        }
        

            case CollectionEventKind.RESET:
                hoverColumnIndex = gridDimensions.getColumnIndexAt(mouseX, mouseY);
                break;
        }
    }

    /**
