Remove the workaround code to avoid ICU Number defect