Adding #32 patch without "layout-column" related theming.