fixes #1931.  Comments in code document why

@sefk 

With some inspiration from #2336 from @dglance , I think this _ought_ to fix the stuttering problem.  I finally found a local dev which reasonably replicates the problem.

This subsumes #2336.