Volker, can you please test the attached patch?

Thanks.

-- 
tejun