Energy units reverted
Merge pull request #845 from Adaptivity/patch-3

Energy units reverted