Remove use of custom tabindex per Bbp#2714