HIP-566 another device removal race condition