Comment 8 for bug 586955

I tried to fix this a few months ago but I ran into weird xml updating bugs. My development computer is offline for a while so go ahead and commit the patch if it works. I'll test too in a week or two when I get my computer back.