Comment 6 for bug 169623

I am working on a new version of the patch, which will address the issues I mentioned earlier and remove the accumulated bit-rot. The new patch should be ready for inclusion into 0.46.