Comment 6 for bug 217878

Finally... been patching this manually since I don't know when.