This is part 2 of a broken down version of the #140101 refactor.

This particular change wasn't in that original refactor but is a note to myself so that I remember how to test each of these changes in the future.