Fix a git apply that went bad somehow.

When applying the changes in 8edd3464,
it seems that this bit got merged incorrectly and no test coverage
caught the issue. This fixes the diagnostic and adds a test.