Stuttering after 2018.08 update

And I didn’t, but @joakim_s dragged my topic into this one.