Comment 37 for bug 43150

Please don't comment things out, rather delete them. In this patch, this isn't much of a problem, because no context is stripped from the beginning to the end, but in general, I find it easier to review with the affected parts actually deleted.

otherwise the patch looks okay to me, +1 for testing this in -proposed.