MFC r313472:

The runlock slow path would update wrong variable before restarting the
loop, in effect corrupting the state.

Something was botched in the previous mfc attempt in r315380.