Battery optimization and build flags revert