Revert "Longer reboot wait period [120 seconds]"

This reverts commit b41b97bb770a39ea4305317d9c079ce0a37e15fa.