For ENG-5972, try and win back a little performance