Revert "Squashed: Fix battery drain"

The problem lies somewhere else

This reverts commit 01e989d451fc20f2ea4affe3b493bb8aa78ad930.

Change-Id: I1aa95b167d0d1997219d291dad17350d12462ef4