envoy: fix up unlocking