Use the real consumption method
Merge pull request #3072 from dimagi/consumption-fixes

Use the real consumption method