Charges reinstated in Guantanamo detainee, Khadr.