Revert "Forward port circle battery."

This reverts commit dbd588412c868afa562e1877ee626812e40524a1.