partially borked change to better deal with run queue idiosyncracies