Revert "More energy changes"

This reverts commit 4736bfa0420d4a373c267dbfb51c59a5e23174d8.