Revert "Fix shutdown/reboot bug"

-Revert in favor of a kernel solution..

This reverts commit b8f2329d4642f76e679fe9f340e97ff49923aa6c.