Comment 3 for bug 1509479

Also wondering if it might be worthwhile to add in a simple counter that bails after a set number of loops (100 or 250 or something reasonable) to short-circuit any other possible oversights that we might have made.