Comment 11 for bug 413278

I've applied a cleaner and more efficient patch.