Restoring a good commit. Re #6485.