Reboot handler cleanup

Do you really mean `||=` or do you mean `||`?