Merge "Revert "Refactor GetIMTIndex""