* Addendum to r60650.