This reverts commit 198fd888add624cf9e53ce31b776568a5d069916 This change seems to have exposed some other bugs. Bug: 5026631