diff --git a/src/text-editor-presenter.coffee b/src/text-editor-presenter.coffee
index a6cd0d0b4..6240f4a37 100644
--- a/src/text-editor-presenter.coffee
+++ b/src/text-editor-presenter.coffee
@@ -700,9 +700,6 @@ class TextEditorPresenter
     if @baseCharacterWidth?
       oldContentWidth = @contentWidth
       rightmostPosition = @model.getRightmostScreenPosition()
-      # TODO: Add some version of this back once softwrap is reintroduced
-      # if @model.tokenizedLineForScreenRow(rightmostPosition.row)?.isSoftWrapped()
-      #   rightmostPosition = @model.clipScreenPosition(rightmostPosition)
       @contentWidth = @pixelPositionForScreenPosition(rightmostPosition).left
       @contentWidth += @scrollLeft
       @contentWidth += 1 unless @model.isSoftWrapped() # account for cursor width
@@ -1077,6 +1074,9 @@ class TextEditorPresenter
       for line, index in @displayLayer.getScreenLines(startRow, endRow + 1)
         @linesByScreenRow.set(startRow + index, line)
 
+  lineIdForScreenRow: (screenRow) ->
+    @linesByScreenRow.get(screenRow).id
+
   fetchDecorations: ->
     return unless 0 <= @startRow <= @endRow <= Infinity
     @decorations = @model.decorationsStateForScreenRowRange(@startRow, @endRow - 1)