fix 8711 -- reword this commit message