shamu isn't booting now This reverts commit c57453d537. Change-Id: I8efbf6260f5fcf983e5056fac6d03916415b944e
c57453d537