diff --git a/src/main/java/io/jenkins/update_center/json/PluginVersions.java b/src/main/java/io/jenkins/update_center/json/PluginVersions.java
index 247c4008f..e18ddd966 100644
--- a/src/main/java/io/jenkins/update_center/json/PluginVersions.java
+++ b/src/main/java/io/jenkins/update_center/json/PluginVersions.java
@@ -20,8 +20,7 @@ public class PluginVersions {
     public Map<String, PluginVersionsEntry> releases = new LinkedHashMap<>();
 
     PluginVersions(Map<VersionNumber, HPI> artifacts) {
-        // TODO this is suboptimal sorting (we'd rather sort by VersionNumber, not its string representation) but imitates existing behavior
-        for (VersionNumber versionNumber : artifacts.keySet().stream().sorted(Comparator.comparing(VersionNumber::toString)).collect(Collectors.toList())) {
+        for (VersionNumber versionNumber : artifacts.keySet().stream().sorted().collect(Collectors.toList())) {
             try {
                 if (releases.put(versionNumber.toString(), new PluginVersionsEntry(artifacts.get(versionNumber))) != null) {
                     throw new IllegalStateException("Duplicate key");