Revert the waitcommands to what they used to be. Get us closer to in sync with upstream.