Moar Batteries :)

Change-Id: I45149c7501cdbd07749f68fd5b7250fcad0d6b70