Revert "Fix shutdown/reboot bug"

This reverts commit 09261ccb404f9a2475d5face14103e89266b1e90.
Revert "STE OMX Fix"

This reverts commit d8ea0bf8da550801457f599af4f1c8258a73d2e3.