Revert "defaulting to 1 more column"

This reverts commit 5b26e201c8aa4bed1a6c15f0e5f51a96793a1bcc.
Revert "Revert "defaulting to 1 more column""

This reverts commit 3b627f30ea47a1cf711103708d4d0b6a43b1b79c.