This reverts commit 82b0c21832.
Reason for revert: The side effect of this refactoring is changing a way how we render diff, how we measure diff performance. Let's discuss this change before we integrate it to gerrit and critique.
Change-Id: I945f22733c71291b15905e3944cd5b7fd0d079b3