Revert r18064 and correctly set the cell size for hash cells.