backout f69fa3c13d1f (bug 1085509) for causing test_cert_overrides.js to fail