Comment 35 for bug 707794

At the time I marked it wontfix, I didn't expect a patch. Completely up to you to decide if it's too intrusive.