diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b5bfa058..5ac8e557 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -58,6 +58,7 @@ metadata_v0:
     - ../tests/dump_internal_metadata_format.py
     - sed -i
           -e "/buildozer/d"
+          -e '/^comments\W /d'
           -e 's,maven\(\W\) false,maven\1 null,'
           metadata/dump_*/*.yaml
     - diff -uw metadata/dump_*
diff --git a/fdroidserver/index.py b/fdroidserver/index.py
index cde814ed..d93ec586 100644
--- a/fdroidserver/index.py
+++ b/fdroidserver/index.py
@@ -878,7 +878,7 @@ def make_v1(apps, packages, repodir, repodict, requestsdict, fdroid_signing_key_
         for k, v in sorted(appdict.items()):
             if not v:
                 continue
-            if k in ('Builds', 'comments', 'metadatapath',
+            if k in ('Builds', 'metadatapath',
                      'ArchivePolicy', 'AutoName', 'AutoUpdateMode', 'MaintainerNotes',
                      'Provides', 'Repo', 'RepoType', 'RequiresRoot',
                      'UpdateCheckData', 'UpdateCheckIgnore', 'UpdateCheckMode',
diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py
index aaa6312b..ff8bf2c3 100644
--- a/fdroidserver/metadata.py
+++ b/fdroidserver/metadata.py
@@ -159,7 +159,6 @@ class App(dict):
         self.id = None
         self.metadatapath = None
         self.Builds = []
-        self.comments = {}
         self.added = None
         self.lastUpdated = None
 
@@ -607,16 +606,6 @@ def read_metadata(appids={}, sort_by_time=False):
     return apps
 
 
-# Known keys not originating from the metadata are:
-#
-#  'comments'         - a list of comments from the metadata file. Each is
-#                       a list of the form [field, comment] where field is
-#                       the name of the field it preceded in the metadata
-#                       file. Where field is None, the comment goes at the
-#                       end of the file. Alternatively, 'build:version' is
-#                       for a comment before a particular build version.
-
-
 def parse_metadata(metadatapath):
     """Parse metadata file, also checking the source repo for .fdroid.yml.
 
diff --git a/tests/metadata/dump/com.politedroid.yaml b/tests/metadata/dump/com.politedroid.yaml
index 4f4be52b..acde9299 100644
--- a/tests/metadata/dump/com.politedroid.yaml
+++ b/tests/metadata/dump/com.politedroid.yaml
@@ -185,7 +185,6 @@ UpdateCheckName: null
 VercodeOperation: []
 WebSite: ''
 added: null
-comments: {}
 id: com.politedroid
 lastUpdated: null
 metadatapath: metadata/com.politedroid.yml
diff --git a/tests/metadata/dump/org.adaway.yaml b/tests/metadata/dump/org.adaway.yaml
index 0428721c..57fab70c 100644
--- a/tests/metadata/dump/org.adaway.yaml
+++ b/tests/metadata/dump/org.adaway.yaml
@@ -1136,7 +1136,6 @@ UpdateCheckName: null
 VercodeOperation: []
 WebSite: http://sufficientlysecure.org/index.php/adaway
 added: null
-comments: {}
 id: org.adaway
 lastUpdated: null
 metadatapath: metadata/org.adaway.yml
diff --git a/tests/metadata/dump/org.smssecure.smssecure.yaml b/tests/metadata/dump/org.smssecure.smssecure.yaml
index 1637ad5a..a88a6a6a 100644
--- a/tests/metadata/dump/org.smssecure.smssecure.yaml
+++ b/tests/metadata/dump/org.smssecure.smssecure.yaml
@@ -406,7 +406,6 @@ UpdateCheckName: null
 VercodeOperation: []
 WebSite: http://www.smssecure.org
 added: null
-comments: {}
 id: org.smssecure.smssecure
 lastUpdated: null
 metadatapath: metadata/org.smssecure.smssecure.yml
diff --git a/tests/metadata/dump/org.videolan.vlc.yaml b/tests/metadata/dump/org.videolan.vlc.yaml
index 42620442..290dbabe 100644
--- a/tests/metadata/dump/org.videolan.vlc.yaml
+++ b/tests/metadata/dump/org.videolan.vlc.yaml
@@ -2643,7 +2643,6 @@ VercodeOperation:
   - '%c + 5'
 WebSite: http://www.videolan.org/vlc/download-android.html
 added: null
-comments: {}
 id: org.videolan.vlc
 lastUpdated: null
 metadatapath: metadata/org.videolan.vlc.yml