Ah, I forgot to update the patch to not use reset_mouse_highlight in the
generic version: