Some months ago I wrote a post describing the problem and updated the bugreport with solution that worked for me. And it is now accepted and hopefully this problem will never arise again. So now I’m just waiting for the changes to appear in the repositories :)