We'll go the long way here, bumping the values first before making
them configurable in the next iteration.

(cherry picked from commit 5ad1fa69)