Revert Index Removal
- Index tracking for component locators is restored.