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

That's a silly bug... It seems to be fixed already on our master. Looks good to me.