Shutdown command accidentally got moved away from the wait for machine
to return after shutdown.