Honor active attach leases when the editor exits normally (#839)