Remove DONTWAIT for now, as it is absent in 2.x