Comment 7 for bug 690625

Are you able to test the above patch? I don't have the problem so I worked a
bit blind on this. This is not a great solution as there's likely to be other
places in the code with the same sorts of issues. And it would be nice if this
was solved further up the stack rather than in driconf code. But if it works it
might be a workaround and upstream can look at it to see what they're going to
have to do everywhere.