A possible fix to this problem can be seen in [check-in 188772a1dbaf066f](src:/info/188772a1dbaf066f). Please try out the new code and report back whether or not it clears your problem. The fix has not yet landed on trunk, because I want to spend more time testing and verifying it's correctness first.