diff --git a/core/src/main/java/hudson/model/Queue.java b/core/src/main/java/hudson/model/Queue.java
index 2876444cf2d81f2bd33a2dfbd1dab4541ff50910..21fe274e390a6e46704faca0fcfc492bd7e9d86d 100644
--- a/core/src/main/java/hudson/model/Queue.java
+++ b/core/src/main/java/hudson/model/Queue.java
@@ -1438,7 +1438,7 @@ public class Queue extends ResourceController implements Saveable {
                 }
             }
 
-            //this is to solve OSS-192. We iterate on the list of flyweight tasks and execute them
+            //this is to solve JENKINS-30084. We iterate on the list of flyweight tasks and execute them
             List<FlyWeightItem> flyweightItems = new ArrayList<>(flyWeightTasks.values());
             for (FlyWeightItem f : flyweightItems) {
                 if (!isBuildBlocked(f)) {
@@ -2357,8 +2357,6 @@ public class Queue extends ResourceController implements Saveable {
      */
     public final class FlyWeightItem extends NotWaitingItem {
 
-        boolean buildable;
-
         public FlyWeightItem(WaitingItem wi) {
             super(wi);
         }
diff --git a/test/src/test/java/hudson/model/queue/WideExecutionTest.java b/test/src/test/java/hudson/model/queue/WideExecutionTest.java
index 271613fc1eec9fd6a6b55eb1070ac9f3af4904d3..29fbd16027162212ef6ef17a9dcf6a01567ea9c6 100644
--- a/test/src/test/java/hudson/model/queue/WideExecutionTest.java
+++ b/test/src/test/java/hudson/model/queue/WideExecutionTest.java
@@ -95,7 +95,7 @@ public class WideExecutionTest {
         }
     }
 
-    @Issue("OSS-192")
+    @Issue("JENKINS-30084")
     @Test
     /*
      * this is to test that when the assigned executor is not available the flyweighttask is put into the buildable list,