Revert "WIP-29 Upgraded datagrid for 4.2"

This reverts commit 7ddb655a0fc7184cc248fac7f1d7ba6cdabbbfc1.