This regresses the performance. Bug: 69165958 This reverts commit c0a35e7b. Change-Id: I86f0b55dc83fdde4ca04659ec0f7bb3589f571fa