This reverts commit e4d31b3c10. Fixes: 71904218 Test: presubmit Change-Id: Id73bde1a0c11696cf561c84cde027cdca4c6a00f
e4d31b3c10