Revert "Update name of field used from BatterySipper"

Companion CL needed to be reverted as it was breaking the build, so
reverting this CL as well until Adam has a chance to investigate.

This reverts commit a74ddc29.

Change-Id: I8e6f2f48d930db9db7eae1a07492da91b0c38f88