Revert: Hot reboot support

Change-Id: Iffc771577ee5c69ebadde286ccb42aed75b86203