I wonder if that won't fix bug 875338 in the same time. Would be awesome :)