Add a bit more delay.
Merge in default
Revert the additional wait, we don't need it any more.
Merge bug26368