diff --git a/app/src/main/java/org/fdroid/fdroid/data/AppProvider.java b/app/src/main/java/org/fdroid/fdroid/data/AppProvider.java
index 96475ea42..f67803ecf 100644
--- a/app/src/main/java/org/fdroid/fdroid/data/AppProvider.java
+++ b/app/src/main/java/org/fdroid/fdroid/data/AppProvider.java
@@ -1057,20 +1057,7 @@ public class AppProvider extends FDroidProvider {
                 " JOIN " + repo + " ON (" + repo + "._id = " + apk + ".repo) " +
                 " WHERE " +
                 app + ".id = " + apk + ".id AND " +
-                apk + ".vercode = ( " +
-
-                    // We only want the latest apk here. Ideally, we should
-                    // instead join onto apk.suggestedVercode, but as per
-                    // https://gitlab.com/fdroid/fdroidclient/issues/1 there
-                    // may be some situations where suggestedVercode isn't
-                    // set.
-                    // TODO: If we can guarantee that suggestedVercode is set,
-                    // then join onto that instead. This will save from doing
-                    // a futher sub query for each app.
-                    " SELECT MAX(inner_apk.vercode)  " +
-                    " FROM " + apk + " as inner_apk " +
-                    " WHERE inner_apk.id = " + apk + ".id ) " +
-                " AND " + apk + ".repo = fdroid_repo._id ";
+                apk + ".vercode = " + app + ".suggestedVercode ";
 
         return
             " UPDATE " + app + " SET " +