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

This reverts commit a1bab878eb11ccb70df09c7876c7baa06fd0e49d

Change-Id: I9ce697e824e1f85becfd0e53519d3ae36fc65758