Fix according to rust master.