This causes problems if the index fails to load. This reverts commit da1fce66465745cd9ef12f38945f8ce4ffcf06bb.