please don't die

Change-Id: Id5d1ec1c1646fd72655aa290823fac174a79c76c