no reason to do this column addition and subtraction business
Revert "Merge pull request #12480 from iwiznia/master"

This reverts commit e5f5a838b96a362534d9bb60d02334439ed9784c, reversing
changes made to d7567f3290a50952494e9213556a1f283a6cf3a0.