Comment 25 for bug 1573594

I accepted this to -proposed, but since this seems to be a security-related fix, I would really want the security team to take a look at the change and decide whether this should actually go through -security or both.