Ah, I think this is related to
There is a tentative fix in that thread, but I was trying to think of a better one!