Merge pull request #9484 from mikeller/remove_legacy_timer_index