Revert "Battery drain fixes"

This reverts commit 673e6963599ae0fd96445cd235d23a5cc8796dd0.

Change-Id: Idee4bc4406ff9f93919e68c17ad7bab87522916f