Revert "Tidy up reboot menu"

This reverts commit 3a42795e49ed18d398705edeb4b8442daab15847.

Needed to (easily) grab the softreboot patches.

Change-Id: I12ef34c6ebe3991f370c941d41e1ea46e685896f