Revert "Multiple columns allowed"

This reverts commit 8794cd302c4b9db620c7d6492af9951e3a3e4011.