Thanks, I can confirm that the attached patch (which reverts that 
change) does fix the bug on the trunk for me (trunk bzr 117838). 
Dmitry, do you have any thoughts?