Revert "Change adding focus indicator logic"

No match.