Work on bug #8348.