ENG-5027 Fix index clearing.