Revert "Merge remote-tracking branch 'origin/cumulative-uses-arithmetic'"

This reverts commit 8e4ee9aa49a567d4c4f876d820051f67173707e7, reversing
changes made to b294d30af062706ae3977e07e728ac9653547dad.