Remove depency on unmerged Waiter class.