diff --git a/src/chrome/content/rules/City-Mail.xml b/src/chrome/content/rules/City-Mail.xml
index e8fe8e9f8c02..7934b0246084 100644
--- a/src/chrome/content/rules/City-Mail.xml
+++ b/src/chrome/content/rules/City-Mail.xml
@@ -8,10 +8,9 @@
 	<target host="www.cityemail.com" />
 
 
-	<securecookie host="^(?:www\.)?cityemail\.com$" name=".+" />
+	<securecookie host=".+" name=".+" />
 
 
-	<rule from="^http://(www\.)?cityemail\.com/"
-		to="https://$1cityemail.com/" />
+	<rule from="^http:" to="https:" />
 
 </ruleset>
diff --git a/src/chrome/content/rules/EPEAT.xml b/src/chrome/content/rules/EPEAT.xml
deleted file mode 100644
index 0f18351672ae..000000000000
--- a/src/chrome/content/rules/EPEAT.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<ruleset name="EPEAT (partial)">
-
-	<target host="ww2.epeat.net" />
-
-
-	<rule from="^http://ww2\.epeat\.net/"
-		to="https://ww2.epeat.net/" />
-
-</ruleset>
diff --git a/src/chrome/content/rules/Ecwid.com.xml b/src/chrome/content/rules/Ecwid.com.xml
new file mode 100644
index 000000000000..072d9119294e
--- /dev/null
+++ b/src/chrome/content/rules/Ecwid.com.xml
@@ -0,0 +1,20 @@
+<!--
+	Non-functional hosts:
+		Incomplete certificate chain error:
+		- ideas.ecwid.com
+-->
+<ruleset name="Ecwid.com (partial)">
+
+	<target host="ecwid.com" />
+	<target host="www.ecwid.com" />
+	<target host="images-cdn.ecwid.com" />
+	<target host="kb.ecwid.com" />
+	<target host="my.ecwid.com" />
+	<target host="static.ecwid.com" />
+	<target host="support.ecwid.com" />
+
+	<securecookie host=".+" name=".+" />
+
+	<rule from="^http:" to="https:" />
+
+</ruleset>
diff --git a/src/chrome/content/rules/Ecwid.xml b/src/chrome/content/rules/Ecwid.xml
deleted file mode 100644
index ff77d4eaaa6f..000000000000
--- a/src/chrome/content/rules/Ecwid.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<!--
-	CDN buckets:
-
-		- dj925myfyz5v.cloudfront.net
-
-			- static.ecwid.com
-
-		- dpbfm6h358sh7.cloudfront.net
-
-			- images-cdn.ecwid.com
-
-		- ecwid.desk.com
-
-			- help.ecwid.com
-
-		- ecwid.pbworks.com
-
-			- kb.ecwid.com
-
-		- ecwid.uservoice.com
-
-			- ideas.ecwid.com
-
-
-	Nonfunctional subdomains:
-
-		- (www.)	(redirects to http)
-		- help		(redirects to http; mismatched, CN: *.assistly.com)
-		- kb		(redirects to http; mismatched, CN: *.pbworks.com)
-
-
-	Problematic subdomains:
-
-		- ideas		(works; mismatched, CN: *.uservoice.com)
-
--->
-<ruleset name="Ecwid (partial)">
-
-	<target host="images-cdn.ecwid.com" />
-	<target host="kb.ecwid.com" />
-	<target host="my.ecwid.com" />
-	<target host="static.ecwid.com" />
-
-
-	<securecookie host="^my\.ecwid\.com$" name=".+" />
-
-
-	<rule from="^http://images-cdn\.ecwid\.com/"
-		to="https://dpbfm6h358sh7.cloudfront.net/" />
-
-	<rule from="^http://kb\.ecwid\.com/(f/|theme_image\.php)"
-		to="https://ecwid.pbworks.com/$1" />
-
-	<rule from="^http://my\.ecwid\.com/"
-		to="https://my.ecwid.com/" />
-
-	<rule from="^http://static\.ecwid\.com/"
-		to="https://dj925myfyz5v.cloudfront.net/" />
-
-</ruleset>
diff --git a/src/chrome/content/rules/OculusVR.com.xml b/src/chrome/content/rules/OculusVR.com.xml
new file mode 100644
index 000000000000..d4142f58650f
--- /dev/null
+++ b/src/chrome/content/rules/OculusVR.com.xml
@@ -0,0 +1,16 @@
+<ruleset name="OculusVR.com">
+	<target host="oculusvr.com" />
+	<target host="www.oculusvr.com" />
+	<target host="answers.oculusvr.com" />
+	<target host="careers.oculusvr.com" />
+	<target host="developer.oculusvr.com" />
+	<target host="forums.oculusvr.com" />
+	<target host="share.oculusvr.com" />
+	<target host="static.oculusvr.com" />
+	<target host="storystudio.oculusvr.com" />
+	<target host="www1.oculusvr.com" />
+
+	<securecookie host=".+" name=".+" />
+
+	<rule from="^http:" to="https:" />
+</ruleset>
diff --git a/src/chrome/content/rules/Oculus_VR.xml b/src/chrome/content/rules/Oculus_VR.xml
deleted file mode 100644
index 54b5500667ce..000000000000
--- a/src/chrome/content/rules/Oculus_VR.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-
-<!--
-Disabled by https-everywhere-checker because:
-Fetch error: http://oculusvr.com/ => https://oculusvr.com/: (60, 'SSL certificate problem: unable to get local issuer certificate')
-Fetch error: http://careers.oculusvr.com/ => https://careers.oculusvr.com/: (60, 'SSL certificate problem: unable to get local issuer certificate')
-Fetch error: http://share.oculusvr.com/ => https://share.oculusvr.com/: (6, 'Could not resolve host: share.oculusvr.com')
-Fetch error: http://www.oculusvr.com/ => https://www.oculusvr.com/: (60, 'SSL certificate problem: unable to get local issuer certificate')
-
-	CDN buckets:
-
-		- s3.amazonaws.com/static.oculus.com/
-		- d11g5bl75h7gks.cloudfront.net
-
-
-	Problematic hosts in *oculusvr.com:
-
-		- answers ¹
-		- forums ¹
-		- static ²
-		- storystudio ¹
-		- www1 ¹
-
-	¹ Shows www1.oculus.com
-	² Cloudfront/mismatched
-
--->
-<ruleset name="Oculus VR" default_off="failed ruleset test">
-
-	<!--	Direct rewrites:
-				-->
-	<target host="oculusvr.com" />
-	<target host="careers.oculusvr.com" />
-	<target host="developer.oculusvr.com" />
-	<target host="share.oculusvr.com" />
-	<target host="www.oculusvr.com" />
-
-	<!--	Complications:
-				-->
-	<target host="answers.oculusvr.com" />
-	<target host="forums.oculusvr.com" />
-	<target host="static.oculusvr.com" />
-	<target host="storystudio.oculusvr.com" />
-	<target host="www1.oculusvr.com" />
-
-
-	<securecookie host="^\w" name=".+" />
-
-
-	<!--	Redirect keeps path and args,
-		but not forward slash:
-					-->
-	<rule from="^http://(?:answers|forums|storystudio|www1)\.oculusvr\.com/+"
-		to="https://www.oculus.com/" />
-
-	<rule from="^http://static\.oculusvr\.com/"
-		to="https://d11g5bl75h7gks.cloudfront.net/" />
-
-	<rule from="^http:"
-		to="https:" />
-
-</ruleset>
diff --git a/src/chrome/content/rules/Ow.ly.xml b/src/chrome/content/rules/Ow.ly.xml
index 0999a8cb576d..cb35365e389d 100644
--- a/src/chrome/content/rules/Ow.ly.xml
+++ b/src/chrome/content/rules/Ow.ly.xml
@@ -17,7 +17,6 @@
 	<target host="static.ow.ly" />
 
 
-	<rule from="^http://static\.ow\.ly/"
-		to="https://d2jhuj1whasmze.cloudfront.net/" />
+	<rule from="^http:" to="https:" />
 
 </ruleset>
diff --git a/src/chrome/content/rules/Pragmatic_Marketing.com.xml b/src/chrome/content/rules/Pragmatic_Marketing.com.xml
index db1e7ada32e5..88f78fff41d1 100644
--- a/src/chrome/content/rules/Pragmatic_Marketing.com.xml
+++ b/src/chrome/content/rules/Pragmatic_Marketing.com.xml
@@ -1,37 +1,13 @@
 <!--
-	CDN buckets:
-
-		- pragmatic-marketing-469ad240.s3.amazonaws.com
-
-		- d1qrnovf1k6d8a.cloudfront.net
-
-			- mediafiles
-
-
-	Partially covered subdomains:
-
-		- (www.)	(some pages redirect to http)
-
-
-	Fully covered subdomains:
-
-		- buy
-		- mediafiles	(→ d1qrnovf1k6d8a.cloudfront.net)
-
+	Non-functional hosts:
+		Timeout:
+		- buy.pragmaticmarketing.com
 -->
 <ruleset name="Pragmatic Marketing.com (partial)">
 
 	<target host="pragmaticmarketing.com" />
-	<target host="buy.pragmaticmarketing.com" />
 	<target host="www.pragmaticmarketing.com" />
 	<target host="mediafiles.pragmaticmarketing.com" />
-		<!--exclusion pattern="^http://(www\.)?pragmaticmarketing\.com/+($|\?|favicon\.ico|my-account/|resources/[\w-]+$)" /-->
-		<exclusion pattern="^http://(?:www\.)?pragmaticmarketing\.com/(?![cC]ontent/|Scripts/)" />
-
-
-
-	<rule from="^http://mediafiles\.pragmaticmarketing\.com/"
-		to="https://d1qrnovf1k6d8a.cloudfront.net/" />
 
 	<rule from="^http:" to="https:" />
 </ruleset>
diff --git a/src/chrome/content/rules/Rev2pub.com.xml b/src/chrome/content/rules/Rev2pub.com.xml
index 90abefd86afa..acdbbd73e704 100644
--- a/src/chrome/content/rules/Rev2pub.com.xml
+++ b/src/chrome/content/rules/Rev2pub.com.xml
@@ -1,26 +1,8 @@
-
-<!--
-Disabled by https-everywhere-checker because:
-Fetch error: http://creative.rev2pub.com/ => https://d1col0l9yjljr0.cloudfront.net/: (6, 'Could not resolve host: d1col0l9yjljr0.cloudfront.net')
-
-Automatically by https-everywhere-checker because:
-Fetch error: http://creative.rev2pub.com/ => https://d1col0l9yjljr0.cloudfront.net/: (6, 'Could not resolve host: d1col0l9yjljr0.cloudfront.net')
-	For other Matomy coverage, see Matomy-Media.xml.
-
-
-	CDN buckets:
-
-		- d1col0l9yjljr0.cloudfront.net
-
-			- creative
-
--->
-<ruleset name="rev2pub.com" default_off="failed ruleset test">
+<ruleset name="rev2pub.com">
 
 	<target host="creative.rev2pub.com" />
 
 
-	<rule from="^http://creative\.rev2pub\.com/"
-		to="https://d1col0l9yjljr0.cloudfront.net/" />
+	<rule from="^http:" to="https:" />
 
 </ruleset>