Bug #170: Remove "wait" option.