ENG-5227 Even better index reactivation fix, working much.