This reverts commit 136d1ecf. Reason for revert: My device didn't boot. :( Change-Id: I11636c2ad03a3c14f5953a700fc3a2d629a81a42