Fix the change made for issue 1243654.

Surprisingly, it turns out there was no test that exercised this code path.
2 files changed