Bug fix: rolling back to use the update wait with expected state. This
version works.