To begin with, this allows me to add a regression test for the change
in the previous commit.