This reverts commit 8dfc226eda.
It seems to cause an off-by-one error in line highlighting under
some circumstances. The highlighting is shown on the line after
the line that was actually changed.
Bug: Issue 12646
Change-Id: I8385e9f7306af5e1b38fd726b3763fd7fe845aac