Revert 'Pad last cell in all cases.'