Revert "Revert "Revert "Revert "Revert "Revert "Revert "Update index"""""""

This reverts commit 8418b693c943ed0f2e68e5457d12093b667a55b4.