Comment 4 for bug 502987

To repeat a bit of the IRC discussion: patch looks generally good, but it would be better if it did not include the code clean-ups (dropping unused functions, removing #if 0 code, etc). This will make reviewing, backporting, and possible regression handling easier.