This is my proposed fix to #2262 (closed). You may or may not like it, but I believe the intent of the patch is at least obvious.
One thing I'd note is that the change to run_conditional is a cleanup rather than a part of the fix; it's just now unnecessary without other changes of the fix.