Moar Batteries :)

Change-Id: I9c7655d2d624e4de8faf9f67916de40f2cb7a156