Comment 21 for bug 117731

Changelog: Can you please use the standard "LP: #1234" syntax and describe the patch and its rationale a bit? (This will be read by users upgrading their stable releases).

The diff is quite intrusive, and I am not able to verify it with eyeballing. However, this more or less seems to be a revert to a previous state of the code, so if it has been tested in gutsy, I am fine with it.