Re-apply previous changes and improve column padding performance some more.