envoy: got the first run logic wrong
cleanup envoy