Why did we remove this wait?