OK, a fix has been checked in. I hope it doesn't break anything, my checkout now fails a lot of tests with or without this change, so I'm checking it in on the 2.10 branch, and I'll have to recheck it out and try again, and I don't have time tonight.