Instead of just removing the highlight. Reviewed-by: Robert Loehning (cherry picked from commit 02734ecc)