Revert "Replace removed NARROW_COLUMNS layout"