Also, just to make it clear in case it wasn't before, this doesn't fix an issue that happens under stress.  This fixes an issue resulting from the bug fixed on the other patch.  I can't come up with any scenario where this happens under normal monitor behaviour if not in the case we fix in the other patch.

The only problem here is that there may be stores suffering from this already.  However, unless their OSDs' state has been unhealthy for waaaay too long, they shouldn't hit this at all.

Not against adding the option, but would like to make it obvious why it didn't occur to me in the first place.