Re #8526 Cleaning up before closing the ticket.