Pushed temporary performance fix