[2.0] No ticket: Simplification of tabindex hook

/cc @timmywil