This reverts commit 8e1ef514. Fixes: 115656946 Bug: 112443425 Reason for revert: b/115656946 Change-Id: I1d95b2125327515eb0a4f2b276d4bce9b8aa74df