Revert "Lock ring battery-4"

This reverts commit a68daad78cd0ac0492e5e5f820abd224a67ef552.
Revert "Lock ring battery-5"

This reverts commit 9b1d39d3848bcdfda50c2f171282193a044b2aaf.
Revert "Lock ring battery-6"

This reverts commit 17f62fab2ea1079bb449cb2d836d19ccadeea203.