diff --git a/CHANGES.txt b/CHANGES.txt
index 93eaeefda..5ef6e3de6 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -22,6 +22,7 @@ Other
promising support for versions supported by the Python core team,
Ubuntu LTS, or Debian stable, and taking into consideration
Debian oldstable and PyPy.
+* Remove polyfill from `polyfill.io`.
New in v8.3.0
=============
diff --git a/docs/manual.rst b/docs/manual.rst
index 0f8f00ea5..57b7b0757 100644
--- a/docs/manual.rst
+++ b/docs/manual.rst
@@ -1690,10 +1690,6 @@ For Mako:
.. code:: html
% if date_fanciness != 0:
- %if date_fanciness == 2:
-
-
- %endif
@@ -1712,10 +1708,6 @@ For Jinja2:
.. code:: html
{% if date_fanciness != 0 %}
- {% if date_fanciness == 2 %}
-
-
- {% endif %}
diff --git a/nikola/data/themes/base-jinja/templates/base_helper.tmpl b/nikola/data/themes/base-jinja/templates/base_helper.tmpl
index 30faac67b..d3fd15337 100644
--- a/nikola/data/themes/base-jinja/templates/base_helper.tmpl
+++ b/nikola/data/themes/base-jinja/templates/base_helper.tmpl
@@ -78,9 +78,6 @@ lang="{{ lang }}">
{% endif %}
{% endif %}
{% if date_fanciness != 0 %}
- {% if date_fanciness == 2 %}
-
- {% endif %}
{% if use_cdn %}
{% else %}
diff --git a/nikola/data/themes/base/templates/base_helper.tmpl b/nikola/data/themes/base/templates/base_helper.tmpl
index a03ae5070..a89478ea0 100644
--- a/nikola/data/themes/base/templates/base_helper.tmpl
+++ b/nikola/data/themes/base/templates/base_helper.tmpl
@@ -78,9 +78,6 @@ lang="${lang}">
% endif
% endif
% if date_fanciness != 0:
- % if date_fanciness == 2:
-
- % endif
% if use_cdn:
% else:
diff --git a/nikola/data/themes/bootblog4-jinja/templates/base_helper.tmpl b/nikola/data/themes/bootblog4-jinja/templates/base_helper.tmpl
index be879131f..69c31c799 100644
--- a/nikola/data/themes/bootblog4-jinja/templates/base_helper.tmpl
+++ b/nikola/data/themes/bootblog4-jinja/templates/base_helper.tmpl
@@ -82,9 +82,6 @@ lang="{{ lang }}">
{% endif %}
{% endif %}
{% if date_fanciness != 0 %}
- {% if date_fanciness == 2 %}
-
- {% endif %}
{% if use_cdn %}
{% else %}
diff --git a/nikola/data/themes/bootblog4/templates/base_helper.tmpl b/nikola/data/themes/bootblog4/templates/base_helper.tmpl
index 7ba4e9256..83b4ce17c 100644
--- a/nikola/data/themes/bootblog4/templates/base_helper.tmpl
+++ b/nikola/data/themes/bootblog4/templates/base_helper.tmpl
@@ -82,9 +82,6 @@ lang="${lang}">
%endif
%endif
%if date_fanciness != 0:
- %if date_fanciness == 2:
-
- %endif
%if use_cdn:
%else:
diff --git a/nikola/data/themes/bootstrap4-jinja/templates/base_helper.tmpl b/nikola/data/themes/bootstrap4-jinja/templates/base_helper.tmpl
index 167e8df1f..4c6a12783 100644
--- a/nikola/data/themes/bootstrap4-jinja/templates/base_helper.tmpl
+++ b/nikola/data/themes/bootstrap4-jinja/templates/base_helper.tmpl
@@ -82,9 +82,6 @@ lang="{{ lang }}">
{% endif %}
{% endif %}
{% if date_fanciness != 0 %}
- {% if date_fanciness == 2 %}
-
- {% endif %}
{% if use_cdn %}
{% else %}
diff --git a/nikola/data/themes/bootstrap4/templates/base_helper.tmpl b/nikola/data/themes/bootstrap4/templates/base_helper.tmpl
index c5895cd2b..f34a5d8d7 100644
--- a/nikola/data/themes/bootstrap4/templates/base_helper.tmpl
+++ b/nikola/data/themes/bootstrap4/templates/base_helper.tmpl
@@ -82,9 +82,6 @@ lang="${lang}">
%endif
%endif
%if date_fanciness != 0:
- %if date_fanciness == 2:
-
- %endif
%if use_cdn:
%else: