Merge "Revert "Refactor TextLine class""