Thanks for the patch (and sorry for the delayed review). The revert did the trick and works fine here. Just curious, was this superseded by b6bb2aa2181037c9f6083aa2016e1c7e7424e0f3 in Alex's tree?