MODE-2318 Corrected behavior of indexes on restart

Incorporated @Xnyle's test from #1265 into this PR, and fixed the reported problem.