Revert "Battery optimization and build flags revert"

This reverts commit bf43e746ffdadc5a1d5fd0e52f65dde5975edcfd.
oops