Revert some commits waiting chameleon battery fix