Remove nobootwait for AWS linux compat