Comment 2 for bug 670251

It's bug 575338 I was thinking of, which is slightly different but a similar fix would work (with John's caveats considered). Deciding what exact behaviour is the hard bit here, changing the match logic is easy.