Merge "Revert "Add arbitrary wait to allow request to go through""