Is this really related to datagrid refactoring?