Bug 7095: Fixing cut and paste error and removing the use of diag() as this does...