This seems to be causing the slowdown. Unfortunately this was a bug before, so we need this.