Comment 13 for bug 746592

This is going to be a significantly larger change than I thought we could originally due to help this situation. Hopefully we can resolve it soon in 11.10 and perhaps get some backports done for the older versions.