Revert attempted fix at column matching