revert lineno and col_offset changes from #16795 (closes #21295)
4 files changed