-RewriteEngine On
-RewriteCond %{HTTP_HOST} ^www\.(.*)$ [NC]
-RewriteRule ^ %{REQUEST_SCHEME}://%1%{REQUEST_URI} [R,L]
-</IfModule>
+# since we set Options -MultiViews in ../.htaccess, we now have to
+# explicitly tell apache that files with no extension are actually
+# .html files
+RewriteCond %{REQUEST_FILENAME}.html -f
+RewriteRule !.*\.html$ %{REQUEST_FILENAME}.html [L]