This reverts commit 633085456e. Bug: 73134570 Change-Id: I7c5171e752dd178dcd64497a780ba0f97d03b7a0
633085456e