This reverts commit 2674ce84.

The commit broke amount generator functionality. That caused 20 errors,
and 64 failures in the test suite.