Revert "RC: Wakelock blocker (2/2) - squashed"

This reverts commit 3a910abebe7bb7afd61b50031df0fcfca8355c01.