Revert attempted fix at column matching
Merge pull request #956 from isuftin/master

Revert attempted fix at column matching