Why remove this wait (and not replace it with something else)? That seems dangerous.