Fixes oversight in commit 2ffa740b.
Per report from Josh Kupershmidt.

I think we've broken this case before, so let's add a regression test
this time.