This partially reverts commit 771dddb711. This was a mistake; non-interactive element should not be included in tab navigation.
771dddb711