Reverted defect6