Backed out changeset 7e424486f60e (bug 950417) for adding new attack surface.