Once more fix wakup issue with some ROM's
This is a merger of commit f4ba0f5f and eb8d314c

Different ROM's responds to different things. The initial fix in f4ba0f5f did fix some of these issues, but it also created new once. The reverted fix in eb8d314c fixed the once that broke with the first, but broke the fixed once.

Anyways, let's just use both and make everyone happy.