This reverts commit 76b4b2c3. Bug: 128688902 Bug: 150032912 Test: boots Change-Id: I0ae248ac2a3fe4002466cae33b231234ddaa69f2