This reverts commit 4c564ef0. Reason for revert: suspected culprit for b/177551997 Change-Id: Idf7ae363faba73bf4c79185b4069201f7173e1ab