diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index b54eb1ef..b0dec316 100644
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -834,12 +834,6 @@ def make_index(apps, sortedids, apks, repodir, archive, categories):
 
         if app['AntiFeatures']:
             af = app['AntiFeatures'].split(',')
-            # TODO: Temporarily not including UpstreamNonFree in the index,
-            # because current F-Droid clients do not understand it, and also
-            # look ugly when they encounter an unknown antifeature. This
-            # filtering can be removed in time...
-            if 'UpstreamNonFree' in af:
-                af.remove('UpstreamNonFree')
             if af:
                 addElement('antifeatures', ','.join(af), doc, apel)
         if app['Provides']: