Revert "Alternative equation - which is better?"
Revert "Alternative equation - which is better?"

This reverts commit 400707b5b0a7605492c855aced16a56c489eb159.

cyclus/dre-paper,gidden/dre-paper,cyclus/dre-paper,gidden/dre-paper