Work on bug #4663.