Revert "Fix battery % always showing at < 100%"

This reverts commit 5f6c085ea46c80dd7b208288480c82f58b66ec57.

Change-Id: I79e1cc7495246ec697523d1f2ace04f8c8fa7432