Manually tested fix for ENG-6635 ensuring drop of EE index.