Revert "Changed how columns are referenced"

This reverts commit 58e26a3f39db09de6e2e8df7e8b58b6827f20162.