This reverts commit 03e826d6. Reason for revert: Breaks testPositionInWindow (b/191838493) Change-Id: Ib49f65b4d3f7f5df7c95a3c229ab08aa8688f7a2