otter: Trying to fix up reboot recovery issue [WIP]