Re #7235 removed obsolete code