Adjustments to maybe stop the effect from happening in #1081, though the suspected cause isn't possible.