Commit of John's change to stop an infinite-loop condition when the