revert bad commit but need other things for hellfire battery bar

Change-Id: I70b6e9d80f485eadf4f04b3648d356b80eac6aa5