Revert CellList improvments