diff --git a/arduino-core/src/cc/arduino/contributions/packages/ContributedPlatform.java b/arduino-core/src/cc/arduino/contributions/packages/ContributedPlatform.java
index 24222a2b4fc..3149aea1e2f 100644
--- a/arduino-core/src/cc/arduino/contributions/packages/ContributedPlatform.java
+++ b/arduino-core/src/cc/arduino/contributions/packages/ContributedPlatform.java
@@ -87,7 +87,7 @@ public void setBuiltIn(boolean builtIn) {
   public static final Comparator<ContributedPlatform> BUILTIN_AS_LAST = (x, y) -> {
     int px = x.isBuiltIn() ? 1 : -1;
     int py = y.isBuiltIn() ? 1 : -1;
-    return py - px;
+    return px - py;
   };
 
   private Map<ContributedToolReference, ContributedTool> resolvedToolReferences;
diff --git a/build/shared/revisions.txt b/build/shared/revisions.txt
index d2134fcf622..ad80435957f 100644
--- a/build/shared/revisions.txt
+++ b/build/shared/revisions.txt
@@ -7,6 +7,7 @@ ARDUINO 1.8.7 2018.09.11
 * Fixed: IDE doesn't start if a library with invalid version is found.
 * Fixed: Better dialog explaining that MacOSX 10.8 is now required. Thanks @PaulStoffregen
 * Fixed: Slow "File" and "Tools" menus in MacOSX
+* Fixed: Weird Board Manager behaviour if AVR core is downgraded to a version earlier than 1.6.22
 * Improved first-use usability if the user don't select the serial port. Thanks @PaulStoffregen
 * Custom "Tools" menu now keeps the order as defined in boards.txt.