Start of work on bug #7579.