Revert "Change adding focus indicator logic"