@michaelcahill: here's a possible fix – I want to do a few more things before we pull it (and there's a specific issue I'll flag separately that I think is true but needs confirmation).