diff --git a/src/chrome/content/rules/US-government-mismatches.xml b/src/chrome/content/rules/US-government-mismatches.xml
deleted file mode 100644
index 3d99060b115b..000000000000
--- a/src/chrome/content/rules/US-government-mismatches.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/chrome/content/rules/US-government.xml b/src/chrome/content/rules/US-government.xml
index 46318267fd96..1160609984c2 100644
--- a/src/chrome/content/rules/US-government.xml
+++ b/src/chrome/content/rules/US-government.xml
@@ -1,276 +1,273 @@
-
+
+
+
+
+
- - arcweb.archives.gov (times out)
- - georgewbush-whitehouse.archives.gov (times out)
- - dfi.ca.gov **
- - leginfo.ca.gov *
- - www.cca-forum.org Differs from http
- - factfinder2.census.gov
- - (www.)civicfed.gov (cert: secure115.inmotionhosting.com; shows that domain's data)
- - (www.)compliance.gov (cert: Plesk; shows default Plesk page)
- - (www.)copyright.gov (cert: wwws.loc.gov; shows that domain's data)
- - (www.)cybercrime.gov (ssl_error_rx_record_too_long)
- - www.defense.gov (Akamai; 301s to http)
- - www.dni.gov 503
- - ems.gov ᶠ
- - www.ems.gov ʰ
- - fs.fed.us
- - nrs.fs.fed.us
- - www.fs.fed.us (Akamai; 302s to http; origin, origin-www, nor www-origin exist)
- - www.fincen.gov (shows login, valid cert)
- - (www.)gao.gov (prints "No Secure Connection (https://) Required")
- - www.gpo.gov (times out)
- - www.grants.gov *
- - appropriations.house.gov (400)
- - clerk.house.gov (timeout)
- - energycommerce.house.gov (400)
- - republicans.energycommerce.house.gov (400)
- - www.hud.gov (Interrupted
- - iedc.in.gov (record_too_long)
- - irs.gov
- - www.irs.gov (redirects to http, akamai)
- - jobs.irs.gov (503, akamai)
- - jobs.irs.com (503, akamai)
- - www.irs.com (redirects to http, akamai)
- - (www.)justice.gov (ssl_error_rx_record_too_long)
- - (www.)manhattanda.org (times out)
- - www.ncs.gov (504, akamai)
- - mymoney.gov *
- - www.mymoney.gov ʰ
- - (www.)nga.gov (times out)
- - www.nhtsa.gov (Akamai; redirects to http)
- - www.acces.nysed.gov (timeout)
- - (www.)pppl.gov (times out)
- - (www.)scstatehouse.gov (times out)
- - secretservice.gov ʳ
- - www.secretservice.gov ʰ
- - www.supremecourt.gov (500; akamai)
- - (www.)usitc.gov (times out)
- - (www.)ustr.gov (cert: ssl2050.cloudflare.com; "Offline Mode")
- - wdfw.wa.gov (works; expired, self-signed)
+
+
+
- * Times out
- ᶠ Handshake fails
- ʰ Redirects to http
- ʳ Refused
- ** Reset
+
+
+
+
+
+
- Problematic domains:
+
+
+
- - ncs.gov (works; mismatched, CN: dhs.gov)
+
+
+
--->
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+