This reverts commit 6132e7bb. Reason for revert: crashes master Bug: 73049495 Change-Id: Idfd9a284163d26970b7cb89dea475d7c6abe0193